diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 016de86..fb30e8b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -73,7 +73,7 @@ This will: # On older Ubuntu/Debian: sudo apt install -y gir1.2-appindicator3-0.1 # On Debian 13+ (trixie) or newer: - sudo apt install -y gir1.2-ayatana-appindicator3 + sudo apt install -y gir1.2-ayatanaappindicator3-0.1 ``` 3. **Set up Python environment:** diff --git a/docs/INSTALL.md b/docs/INSTALL.md index d78fb09..2ad780c 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -150,7 +150,7 @@ sudo apt install -y \ # - On older Ubuntu/Debian versions: sudo apt install -y gir1.2-appindicator3-0.1 # - On Debian 13+ (trixie) or newer Ubuntu versions: -sudo apt install -y gir1.2-ayatana-appindicator3 +sudo apt install -y gir1.2-ayatanaappindicator3-0.1 # For X11 sudo apt install -y xdotool @@ -257,7 +257,7 @@ sudo apt install python3-gi python3-gi-cairo # For appindicator (system tray icon) - try one of these: sudo apt install gir1.2-appindicator3-0.1 # For older Debian/Ubuntu # OR -sudo apt install gir1.2-ayatana-appindicator3 # For Debian 13+ or newer Ubuntu +sudo apt install gir1.2-ayatanaappindicator3-0.1 # For Debian 13+ or newer Ubuntu # Recreate venv with system packages rm -rf venv diff --git a/install.sh b/install.sh index 1b211c7..27aadd0 100755 --- a/install.sh +++ b/install.sh @@ -288,19 +288,19 @@ install_system_dependencies() { sudo apt update || { print_error "Failed to update package lists"; exit 1; } # Handle appindicator package: old package was deprecated in Debian 13+ - # Try the old package first, fall back to ayatana-appindicator if unavailable + # Try the old package first, fall back to gir1.2-ayatanaappindicator3-0.1 if unavailable if echo "$MISSING_PACKAGES" | grep -q "gir1.2-appindicator3-0.1"; then # Remove appindicator from the package list for special handling FILTERED_PACKAGES=$(echo "$MISSING_PACKAGES" | sed 's/gir1.2-appindicator3-0.1//' | xargs) # Try to install the old package first (for older Debian/Ubuntu versions) if ! sudo apt install -y gir1.2-appindicator3-0.1 2>/dev/null; then - print_info "gir1.2-appindicator3-0.1 not available, trying gir1.2-ayatana-appindicator3..." - if ! sudo apt install -y gir1.2-ayatana-appindicator3; then - print_error "Failed to install appindicator package (tried both gir1.2-appindicator3-0.1 and gir1.2-ayatana-appindicator3)" + print_info "gir1.2-appindicator3-0.1 not available, trying gir1.2-ayatanaappindicator3-0.1..." + if ! sudo apt install -y gir1.2-ayatanaappindicator3-0.1; then + print_error "Failed to install appindicator package (tried both gir1.2-appindicator3-0.1 and gir1.2-ayatanaappindicator3-0.1)" exit 1 fi - print_info "Successfully installed gir1.2-ayatana-appindicator3 (modern replacement)" + print_info "Successfully installed gir1.2-ayatanaappindicator3-0.1 (modern replacement)" fi # Install remaining packages diff --git a/src/vocalinux/main.py b/src/vocalinux/main.py index dffccf9..1e346db 100644 --- a/src/vocalinux/main.py +++ b/src/vocalinux/main.py @@ -87,7 +87,7 @@ def check_dependencies(): missing_deps.append( "GTK3 and AppIndicator3 (install with: sudo apt install " "python3-gi gir1.2-appindicator3-0.1) " - "Note: On Debian 13+ use gir1.2-ayatana-appindicator3 instead" + "Note: On Debian 13+ use gir1.2-ayatanaappindicator3-0.1 instead" ) if missing_deps: