SirBlob/RDC_Simulation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Install Scripts

Browse Source
This commit is contained in:
default
2026-01-07 20:07:38 +00:00
parent e6ed6fcfac
commit a21cd50e9c
3 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/run_ardupilot_controller.sh
View File

@@ -14,12 +14,18 @@ set -e
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
PROJECT_DIR="$(dirname "$SCRIPT_DIR")" PROJECT_DIR="$(dirname "$SCRIPT_DIR")"
# Deactivate any existing virtual environment to avoid conflicts
if [ -n "$VIRTUAL_ENV" ]; then
deactivate 2>/dev/null || true
fi
# Source ArduPilot environment # Source ArduPilot environment
if [ -f "$HOME/.ardupilot_env" ]; then if [ -f "$HOME/.ardupilot_env" ]; then
source "$HOME/.ardupilot_env" source "$HOME/.ardupilot_env"
fi fi
# Activate ArduPilot venv (has empy and other dependencies) # Activate ArduPilot venv (has empy and other dependencies)
# This MUST be the active venv for sim_vehicle.py to work
if [ -f "$HOME/venv-ardupilot/bin/activate" ]; then if [ -f "$HOME/venv-ardupilot/bin/activate" ]; then
source "$HOME/venv-ardupilot/bin/activate" source "$HOME/venv-ardupilot/bin/activate"
fi fi
@@ -36,9 +42,13 @@ if ! command -v sim_vehicle.py &> /dev/null; then
exit 1 exit 1
fi fi
# Activate virtual environment if exists # Verify correct Python environment (ArduPilot venv should have empy)
if [ -f "$PROJECT_DIR/venv/bin/activate" ]; then if ! python3 -c "import em" 2>/dev/null; then
source "$PROJECT_DIR/venv/bin/activate" echo "[WARN] empy not found in current Python environment"
echo "[INFO] Attempting to use ArduPilot venv..."
if [ -f "$HOME/venv-ardupilot/bin/activate" ]; then
source "$HOME/venv-ardupilot/bin/activate"
fi
fi fi
# Start SITL in background # Start SITL in background

8
setup/install_arch.sh
View File

@@ -129,11 +129,17 @@ if [ -f "$HOME/.ardupilot_env" ]; then
echo "[OK] ArduPilot environment" echo "[OK] ArduPilot environment"
fi fi
# Deactivate any existing venv to avoid conflicts
if [ -n "$VIRTUAL_ENV" ]; then
deactivate 2>/dev/null || true
fi
# Activate ArduPilot venv (has empy and other dependencies) # Activate ArduPilot venv (has empy and other dependencies)
# This is preferred over project venv for ArduPilot compatibility
if [ -f "$HOME/venv-ardupilot/bin/activate" ]; then if [ -f "$HOME/venv-ardupilot/bin/activate" ]; then
source "$HOME/venv-ardupilot/bin/activate" source "$HOME/venv-ardupilot/bin/activate"
echo "[OK] ArduPilot venv" echo "[OK] ArduPilot venv"
# Fallback to project venv # Fallback to project venv only if ArduPilot not installed
elif [ -f "$SCRIPT_DIR/venv/bin/activate" ]; then elif [ -f "$SCRIPT_DIR/venv/bin/activate" ]; then
source "$SCRIPT_DIR/venv/bin/activate" source "$SCRIPT_DIR/venv/bin/activate"
echo "[OK] Python venv activated" echo "[OK] Python venv activated"

8
setup/install_ubuntu.sh
View File

@@ -183,11 +183,17 @@ if [ -f "$HOME/.ardupilot_env" ]; then
echo "[OK] ArduPilot environment" echo "[OK] ArduPilot environment"
fi fi
# Deactivate any existing venv to avoid conflicts
if [ -n "$VIRTUAL_ENV" ]; then
deactivate 2>/dev/null || true
fi
# Activate ArduPilot venv (has empy and other dependencies) # Activate ArduPilot venv (has empy and other dependencies)
# This is preferred over project venv for ArduPilot compatibility
if [ -f "$HOME/venv-ardupilot/bin/activate" ]; then if [ -f "$HOME/venv-ardupilot/bin/activate" ]; then
source "$HOME/venv-ardupilot/bin/activate" source "$HOME/venv-ardupilot/bin/activate"
echo "[OK] ArduPilot venv" echo "[OK] ArduPilot venv"
# Fallback to project venv # Fallback to project venv only if ArduPilot not installed
elif [ -f "$SCRIPT_DIR/venv/bin/activate" ]; then elif [ -f "$SCRIPT_DIR/venv/bin/activate" ]; then
source "$SCRIPT_DIR/venv/bin/activate" source "$SCRIPT_DIR/venv/bin/activate"
echo "[OK] Python venv" echo "[OK] Python venv"