move launch_brickpi3_troubleshooter.sh to $HOME

Author: CleoQc

Software/Python/brickpi3/scripts/install_trixie.sh

@@ -102,14 +102,16 @@ if [ "$INSTALL_GUI" -eq 1 ]; then
     # Desktop integration for Troubleshooter
     SRC_DIR="$SCRIPT_DIR/../troubleshooting"
     DESKTOP_FILE="$SRC_DIR/BrickPi3_Troubleshooter.desktop"
-    LAUNCH_SCRIPT="$SRC_DIR/launch_troubleshooter.sh"
+    LAUNCH_SCRIPT="$SRC_DIR/launch_brickpi3_troubleshooter.sh"
     DESKTOP_TARGET="$HOME/Desktop/BrickPi3_Troubleshooter.desktop"
 
 
     if [ -f "$LAUNCH_SCRIPT" ]; then
-        echo "Copying launch_troubleshooter.sh to $HOME..."
-        LAUNCH_SCRIPT_COPY="$HOME/launch_troubleshooter.sh"
+        echo "Copying launch_brickpi3_troubleshooter.sh to $HOME..."
+        LAUNCH_SCRIPT_COPY="$HOME/launch_brickpi3_troubleshooter.sh"
         cp "$LAUNCH_SCRIPT" "$LAUNCH_SCRIPT_COPY"
+        # Patch the placeholder with the actual venv path used by this install
+        sed -i "s|@@VENV_DIR@@|$VENV_DIR|" "$LAUNCH_SCRIPT_COPY"
         chmod +x "$LAUNCH_SCRIPT_COPY"
     else
         echo "Troubleshooter launch script not found at $LAUNCH_SCRIPT"
@@ -119,7 +121,7 @@ if [ "$INSTALL_GUI" -eq 1 ]; then
         echo "Copying and patching Troubleshooter desktop file to Desktop..."
         TMP_PATCHED_DESKTOP="/tmp/BrickPi3_Troubleshooter.desktop"
         cp "$DESKTOP_FILE" "$TMP_PATCHED_DESKTOP"
-        LAUNCH_PATH="$HOME/launch_troubleshooter.sh"
+        LAUNCH_PATH="$HOME/launch_brickpi3_troubleshooter.sh"
         # Escape spaces for .desktop Exec line
         LAUNCH_PATH_ESCAPED="${LAUNCH_PATH// /\\ }"
         sed -i "s|^Exec=.*$|Exec=\"$LAUNCH_PATH_ESCAPED\"|" "$TMP_PATCHED_DESKTOP"

Software/Python/brickpi3/troubleshooting/BrickPi3_Troubleshooter.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=BrickPi3 Troubleshooter
-Exec=/bin/bash -c '"$(dirname "$(readlink -f "%k")")/launch_troubleshooter.sh"'
+Exec=/bin/bash -c '"$(dirname "$(readlink -f "%k")")/launch_brickpi3_troubleshooter.sh"'
 Icon=BrickPi3.png
 Terminal=true
 Categories=Utility;

Software/Python/brickpi3/troubleshooting/launch_brickpi3_troubleshooter.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+# BrickPi3 Troubleshooter Launcher
+# This script is copied to $HOME by install_trixie.sh, which patches VENV_DIR below.
+
+# Virtual environment to use — patched by install_trixie.sh at install time
+VENV_DIR="@@VENV_DIR@@"
+
+# Activate the venv if not already active
+if [ -z "$VIRTUAL_ENV" ]; then
+    if [ -d "$VENV_DIR" ]; then
+        # shellcheck disable=SC1090
+        source "$VENV_DIR/bin/activate"
+        export VENV_INFO="Activated virtual environment: $VENV_DIR"
+        echo "[INFO] $VENV_INFO"
+    else
+        echo "[ERROR] Virtual environment not found at $VENV_DIR"
+        exit 1
+    fi
+else
+    export VENV_INFO="Using already-active virtual environment: $VIRTUAL_ENV"
+    echo "[INFO] $VENV_INFO"
+fi
+
+# Locate troubleshooter_gui.py via the installed brickpi3 package
+TROUBLESHOOTER_GUI="$(python3 -c "import brickpi3, os; print(os.path.join(os.path.dirname(brickpi3.__file__), 'troubleshooting', 'troubleshooter_gui.py'))")"
+
+if [ ! -f "$TROUBLESHOOTER_GUI" ]; then
+    echo "[ERROR] troubleshooter_gui.py not found via brickpi3 package (looked at: $TROUBLESHOOTER_GUI)"
+    exit 1
+fi
+
+echo "[INFO] Launching: $TROUBLESHOOTER_GUI"
+python3 "$TROUBLESHOOTER_GUI"