Merge pull request #7 from Unity-Lab-AI/codex/2025-08-08-fix-missing-virtual-environment-activation

hackall360 · web-flow · commit 804a9897a5cc · 2025-08-07T22:45:09.000-07:00
Ensure setup scripts run from their own directory
diff --git a/setup.bat b/setup.bat
@@ -1,6 +1,10 @@
 @echo off
 setlocal enabledelayedexpansion
 
+REM Ensure the script runs from its own directory
+set "SCRIPT_DIR=%~dp0"
+cd /d "%SCRIPT_DIR%"
+
 REM Ensure Python is available without compiling
 where python >nul 2>&1
 if errorlevel 1 (
diff --git a/setup.sh b/setup.sh
@@ -3,7 +3,11 @@
 # Setup script for UnityBotV4 on Linux
 set -e
 
-read -p "Use .env file for configuration? (y/n): " use_env
+# Ensure the script runs from its own directory
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+cd "$SCRIPT_DIR"
+
+read -r -p "Use .env file for configuration? (y/n): " use_env
 
 if [[ "$use_env" =~ ^[Yy]$ ]]; then
     TARGET="env"
@@ -43,11 +47,11 @@ else
 fi
 
 # Verify Python version
-python3 - <<'PYTHON'
+if ! python3 - <<'PYTHON'
 import sys
 sys.exit(0 if sys.version_info >= (3, 8) else 1)
 PYTHON
-if [ $? -ne 0 ]; then
+then
     echo "Python 3.8+ is required. Please install a supported version." >&2
     exit 1
 fi
@@ -56,19 +60,21 @@ fi
 if [ ! -d .venv ]; then
     python3 -m venv .venv || { echo "Failed to create virtual environment" >&2; exit 1; }
 fi
+# shellcheck source=/dev/null
 source .venv/bin/activate
 
 prompt_var() {
     local var_name=$1
-    local env_val=$(printenv "$var_name")
+    local env_val
+    env_val=$(printenv "$var_name")
     local file_val=""
     [[ -f .env ]] && file_val=$(grep -E "^${var_name}=" .env | cut -d'=' -f2-)
 
     if [[ "$TARGET" == "env" ]]; then
         if [[ -n "$file_val" ]]; then
             echo "$var_name already set in .env. Skipping prompt."
         else
-            read -p "Enter value for $var_name${env_val:+ [$env_val]}: " value
+            read -r -p "Enter value for $var_name${env_val:+ [$env_val]}: " value
             value=${value:-$env_val}
             [[ -f .env ]] && grep -v "^$var_name=" .env > .env.tmp && mv .env.tmp .env
             echo "$var_name=$value" >> .env
@@ -77,7 +83,7 @@ prompt_var() {
         if [[ -n "$env_val" ]]; then
             echo "$var_name already set. Skipping prompt."
         else
-            read -p "Enter value for $var_name: " value
+            read -r -p "Enter value for $var_name: " value
             if grep -q "^$var_name=" /etc/environment 2>/dev/null; then
                 sudo sed -i "s/^$var_name=.*/$var_name=\"${value}\"/" /etc/environment
             else
