From 0b7c40a14a561777f5b3322d016d55ced0aa9e34 Mon Sep 17 00:00:00 2001 From: YueGuobin Date: Fri, 24 Apr 2026 00:04:21 +0800 Subject: [PATCH] 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 --- 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"]