Merge pull request #8 from Unity-Lab-AI/codex/2025-08-08-test-and-fix-discord-bot-errors

hackall360 · web-flow · commit b9fc646805ba · 2025-08-07T23:21:36.000-07:00
Handle missing env vars in setup and systemd check
diff --git a/install.sh b/install.sh
@@ -6,13 +6,28 @@ set -e
 SERVICE_NAME="unitybot"
 SCRIPT_DIR="$(dirname "$(realpath "$0")")"
 
+if [ "$(id -u)" -eq 0 ]; then
+    SUDO=""
+else
+    SUDO="sudo"
+fi
+
+if ! command -v systemctl >/dev/null; then
+    echo "systemctl not found. This installer requires systemd." >&2
+    exit 1
+fi
+if [ ! -d /run/systemd/system ]; then
+    echo "systemd is not running. Cannot install service." >&2
+    exit 1
+fi
+
 VENV_PYTHON="${SCRIPT_DIR}/.venv/bin/python"
 if [ ! -x "$VENV_PYTHON" ]; then
     echo "Virtual environment not found. Run setup.sh before installing the service." >&2
     exit 1
 fi
 
-cat <<EOF | sudo tee /etc/systemd/system/${SERVICE_NAME}.service >/dev/null
+cat <<EOF | $SUDO tee /etc/systemd/system/${SERVICE_NAME}.service >/dev/null
 [Unit]
 Description=UnityBot Discord Bot
 After=network.target
@@ -29,9 +44,9 @@ Restart=on-failure
 WantedBy=multi-user.target
 EOF
 
-sudo systemctl daemon-reload
-sudo systemctl enable ${SERVICE_NAME}
-sudo systemctl start ${SERVICE_NAME}
+$SUDO systemctl daemon-reload
+$SUDO systemctl enable ${SERVICE_NAME}
+$SUDO systemctl start ${SERVICE_NAME}
 
 echo "Service ${SERVICE_NAME} installed and started."
 
diff --git a/setup.sh b/setup.sh
@@ -66,9 +66,9 @@ source .venv/bin/activate
 prompt_var() {
     local var_name=$1
     local env_val
-    env_val=$(printenv "$var_name")
+    env_val=$(printenv "$var_name" 2>/dev/null || true)
     local file_val=""
-    [[ -f .env ]] && file_val=$(grep -E "^${var_name}=" .env | cut -d'=' -f2-)
+    [[ -f .env ]] && file_val=$(grep -E "^${var_name}=" .env | cut -d'=' -f2- 2>/dev/null || true)
 
     if [[ "$TARGET" == "env" ]]; then
         if [[ -n "$file_val" ]]; then
