From 0b7c40a14a561777f5b3322d016d55ced0aa9e34 Mon Sep 17 00:00:00 2001
From: YueGuobin <yueguobin@outlook.com>
Date: Fri, 24 Apr 2026 00:04:21 +0800
Subject: [PATCH 1/2] fix: rename wireshark CLI to gns3-wireshark to avoid
 conflict

The wireshark CLI entry point creates /usr/bin/wireshark which conflicts
with the system wireshark package on Arch Linux (owned by wireshark-qt),
causing package installation to fail.

Rename to gns3-wireshark to follow the same naming convention as other
GNS3 CLI tools (gns3server, gns3vmnet).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 README.md                                               | 2 +-
 gns3server/agent/web_wireshark/WEB_WIRESHARK.md         | 2 +-
 gns3server/agent/web_wireshark/setup_wireshark_image.py | 2 +-
 pyproject.toml                                          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index a6b2585ba..fd33b3f96 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ python3 -m pip install gns3-server[dev]
 
 **Web Wireshark** (Optional):
 ```shell
-pip install gns3-server && gns3-wireshark-setup
+pip install gns3-server && gns3-wireshark
 ```
 Browser-based packet capture analysis using Wireshark in a Docker container.
 
diff --git a/gns3server/agent/web_wireshark/WEB_WIRESHARK.md b/gns3server/agent/web_wireshark/WEB_WIRESHARK.md
index 0d9a6e2c2..80c5b796d 100644
--- a/gns3server/agent/web_wireshark/WEB_WIRESHARK.md
+++ b/gns3server/agent/web_wireshark/WEB_WIRESHARK.md
@@ -10,7 +10,7 @@ This document describes how to manage GNS3 Web Wireshark containers using the ma
 Before using Web Wireshark, you need to set up the Docker image:
 
 ```bash
-pip install . && gns3-wireshark-setup
+pip install . && gns3-wireshark
 ```
 
 This will:
diff --git a/gns3server/agent/web_wireshark/setup_wireshark_image.py b/gns3server/agent/web_wireshark/setup_wireshark_image.py
index fbbda472d..92c70ad0a 100644
--- a/gns3server/agent/web_wireshark/setup_wireshark_image.py
+++ b/gns3server/agent/web_wireshark/setup_wireshark_image.py
@@ -20,7 +20,7 @@
 Setup Web Wireshark Docker image.
 
 This script pulls or builds the gns3/web-wireshark Docker image.
-Run with: pip install gns3server[wireshark] && gns3-wireshark-setup
+Run with: pip install gns3server && gns3-wireshark
 """
 
 import os
diff --git a/pyproject.toml b/pyproject.toml
index 3135699d7..f79ab3369 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -51,7 +51,7 @@ ai-copilot = {file = ['ai-requirements.txt']}
 gns3server = "gns3server.main:main"
 gns3vmnet = "gns3server.utils.vmnet:main"
 gns3server-uninstall-ai-copilot = "gns3server.utils.uninstall_ai_copilot:main"
-wireshark = "gns3server.agent.web_wireshark.setup_wireshark_image:main"
+gns3-wireshark = "gns3server.agent.web_wireshark.setup_wireshark_image:main"
 
 [tool.setuptools]
 packages = ["gns3server"]

From 640910ec8e66f111421a1b3019b5289edc6ea28c Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Fri, 24 Apr 2026 00:48:00 +0800
Subject: [PATCH 2/2] Use gns3server-web-wireshark-setup in docs

---
 README.md                                               | 4 ++--
 gns3server/agent/web_wireshark/WEB_WIRESHARK.md         | 2 +-
 gns3server/agent/web_wireshark/setup_wireshark_image.py | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index fd33b3f96..ab6187287 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ python3 -m pip install gns3-server[dev]
 
 **Web Wireshark** (Optional):
 ```shell
-pip install gns3-server && gns3-wireshark
+pip install gns3-server && gns3server-web-wireshark-setup
 ```
 Browser-based packet capture analysis using Wireshark in a Docker container.
 
@@ -194,4 +194,4 @@ Bug fixes or small improvements pull requests go here.
 
 3.x development brand for the next major release.
 
-**Never** use this branch for production. Pull requests for major new features go here.
\ No newline at end of file
+**Never** use this branch for production. Pull requests for major new features go here.
diff --git a/gns3server/agent/web_wireshark/WEB_WIRESHARK.md b/gns3server/agent/web_wireshark/WEB_WIRESHARK.md
index 80c5b796d..8f2a96133 100644
--- a/gns3server/agent/web_wireshark/WEB_WIRESHARK.md
+++ b/gns3server/agent/web_wireshark/WEB_WIRESHARK.md
@@ -10,7 +10,7 @@ This document describes how to manage GNS3 Web Wireshark containers using the ma
 Before using Web Wireshark, you need to set up the Docker image:
 
 ```bash
-pip install . && gns3-wireshark
+pip install . && gns3server-web-wireshark-setup
 ```
 
 This will:
diff --git a/gns3server/agent/web_wireshark/setup_wireshark_image.py b/gns3server/agent/web_wireshark/setup_wireshark_image.py
index 92c70ad0a..65afc892d 100644
--- a/gns3server/agent/web_wireshark/setup_wireshark_image.py
+++ b/gns3server/agent/web_wireshark/setup_wireshark_image.py
@@ -20,7 +20,7 @@
 Setup Web Wireshark Docker image.
 
 This script pulls or builds the gns3/web-wireshark Docker image.
-Run with: pip install gns3server && gns3-wireshark
+Run with: pip install gns3server && gns3server-web-wireshark-setup
 """
 
 import os