From 4e2a22d35ec3d0261c391bb0970c8be91a7ed904 Mon Sep 17 00:00:00 2001
From: Jens Ahrensfeld <jens@jayfield.org>
Date: Fri, 29 May 2026 09:30:07 +0200
Subject: [PATCH] installers: move to project root, share a single .venv
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

client/install.sh → install_client.sh
server/install.sh → install_server.sh

Both scripts now resolve REPO_DIR as their own directory (repo root)
and use a shared .venv at the repo root instead of per-subdirectory
virtual environments.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 client/install.sh => install_client.sh | 20 ++++++++++----------
 server/install.sh => install_server.sh |  6 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)
 rename client/install.sh => install_client.sh (85%)
 rename server/install.sh => install_server.sh (97%)

diff --git a/client/install.sh b/install_client.sh
similarity index 85%
rename from client/install.sh
rename to install_client.sh
index 0087c89..fe32c4c 100755
--- a/client/install.sh
+++ b/install_client.sh
@@ -1,20 +1,20 @@
 #!/usr/bin/env bash
 # CLIENT installer — sets up the we_monitor GUI client.
-# Does NOT install the server (see server/install.sh).
+# Does NOT install the server (see install_server.sh).
 #
 # Fresh install:
-#   chmod +x install.sh
-#   ./install.sh
+#   chmod +x install_client.sh
+#   ./install_client.sh
 #
 # Update (code already pulled via git):
-#   ./install.sh
+#   ./install_client.sh
 
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-REPO_DIR="$(dirname "$SCRIPT_DIR")"
+REPO_DIR="$SCRIPT_DIR"
 
-VENV="$SCRIPT_DIR/.venv"
+VENV="$REPO_DIR/.venv"
 PYTHON="$VENV/bin/python"
 
 IS_UPDATE=false
@@ -41,15 +41,15 @@ fi
 
 echo "==> Installing / updating dependencies"
 "$VENV/bin/pip" install --quiet --upgrade pip
-"$VENV/bin/pip" install --quiet --upgrade -r "$SCRIPT_DIR/requirements.txt"
+"$VENV/bin/pip" install --quiet --upgrade -r "$REPO_DIR/client/requirements.txt"
 echo "    Python  : $PYTHON"
 echo ""
 
 # ── 2. launcher script ────────────────────────────────────────────────────────
-LAUNCHER="$SCRIPT_DIR/run.sh"
+LAUNCHER="$REPO_DIR/client/run.sh"
 cat > "$LAUNCHER" <<EOF
 #!/usr/bin/env bash
-exec "$PYTHON" "$SCRIPT_DIR/gui_client.py" "\$@"
+exec "$PYTHON" "$REPO_DIR/client/gui_client.py" "\$@"
 EOF
 chmod +x "$LAUNCHER"
 echo "==> Launcher written             : $LAUNCHER"
@@ -60,7 +60,7 @@ CMD="$BIN_DIR/we_monitor_gui"
 mkdir -p "$BIN_DIR"
 cat > "$CMD" <<EOF
 #!/usr/bin/env bash
-exec "$PYTHON" "$SCRIPT_DIR/gui_client.py" "\$@"
+exec "$PYTHON" "$REPO_DIR/client/gui_client.py" "\$@"
 EOF
 chmod +x "$CMD"
 echo "==> System command               : $CMD"
diff --git a/server/install.sh b/install_server.sh
similarity index 97%
rename from server/install.sh
rename to install_server.sh
index 26284dc..302aa49 100755
--- a/server/install.sh
+++ b/install_server.sh
@@ -15,7 +15,7 @@
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-REPO_DIR="$(dirname "$SCRIPT_DIR")"
+REPO_DIR="$SCRIPT_DIR"
 SERVICE_NAME="we_monitor"
 CREDS_DIR="$HOME/.config/we_monitor"
 CREDS_FILE="$CREDS_DIR/credentials.json"
@@ -23,7 +23,7 @@ SYSTEMD_DIR="$HOME/.config/systemd/user"
 SERVICE_FILE="$SYSTEMD_DIR/$SERVICE_NAME.service"
 LOG_DIR="$REPO_DIR/logs"
 
-VENV="$SCRIPT_DIR/.venv"
+VENV="$REPO_DIR/.venv"
 PYTHON="$VENV/bin/python"
 
 # detect fresh install vs update
@@ -55,7 +55,7 @@ fi
 
 echo "==> Installing / updating dependencies"
 "$VENV/bin/pip" install --quiet --upgrade pip
-"$VENV/bin/pip" install --quiet --upgrade -r "$SCRIPT_DIR/requirements.txt"
+"$VENV/bin/pip" install --quiet --upgrade -r "$REPO_DIR/server/requirements.txt"
 
 echo "==> Applying cariad-hybrid-auth-fix.patch to volkswagencarnet"
 SITE_PKG="$("$PYTHON" -c 'import sysconfig; print(sysconfig.get_path("purelib"))')"