From d0ce943d6c660c858eef059f0ce54c940e9a1994 Mon Sep 17 00:00:00 2001
From: CanbiZ <47820557+MickLesk@users.noreply.github.com>
Date: Mon, 29 Sep 2025 10:06:34 +0200
Subject: [PATCH] Update install scripts for Livebook and Viseron

Set default Ubuntu version to 24.04 in ct/livebook.sh. Improve GPU detection and PyTorch installation logic in viseron-install.sh, supporting NVIDIA, Intel, AMD, and CPU-only environments. Update Python version to 3.13 and adjust credential file naming. Minor formatting fix in livebook-install.sh.
---
 ct/livebook.sh              |  2 +-
 install/livebook-install.sh |  2 +-
 install/viseron-install.sh  | 79 ++++++++++++++++++++++++-------------
 3 files changed, 53 insertions(+), 30 deletions(-)

diff --git a/ct/livebook.sh b/ct/livebook.sh
index 5f801ac7..3afc4353 100755
--- a/ct/livebook.sh
+++ b/ct/livebook.sh
@@ -11,7 +11,7 @@ var_disk="${var_disk:-4}"
 var_cpu="${var_cpu:-2}"
 var_ram="${var_ram:-1024}"
 var_os="${var_os:-ubuntu}"
-var_version="${var_version:-24}"
+var_version="${var_version:-24.04}"
 var_unprivileged="${var_unprivileged:-1}"
 
 header_info "$APP"
diff --git a/install/livebook-install.sh b/install/livebook-install.sh
index 1d9b98d3..902d86d2 100644
--- a/install/livebook-install.sh
+++ b/install/livebook-install.sh
@@ -99,7 +99,7 @@ msg_ok "Installed Livebook"
 motd_ssh
 customize
 
-msg_info "Cleaning Up"
+msg_info "Cleaning Up"  
 $STD apt-get autoremove -y
 $STD apt-get autoclean
 msg_ok "Cleaned Up"
diff --git a/install/viseron-install.sh b/install/viseron-install.sh
index e0835a59..78967057 100644
--- a/install/viseron-install.sh
+++ b/install/viseron-install.sh
@@ -36,46 +36,69 @@ $STD sudo -u postgres psql -c "ALTER ROLE $DB_USER SET client_encoding TO 'utf8'
 $STD sudo -u postgres psql -c "ALTER ROLE $DB_USER SET default_transaction_isolation TO 'read committed';"
 $STD sudo -u postgres psql -c "ALTER ROLE $DB_USER SET timezone TO 'UTC'"
 {
-    echo "Hanko-Credentials"
-    echo "Hanko Database User: $DB_USER"
-    echo "Hanko Database Password: $DB_PASS"
-    echo "Hanko Database Name: $DB_NAME"
-} >>~/hanko.creds
+    echo "Viseron-Credentials"
+    echo "Viseron Database User: $DB_USER"
+    echo "Viseron Database Password: $DB_PASS"
+    echo "Viseron Database Name: $DB_NAME"
+} >>~/viseron.creds
 msg_ok "Set up PostgreSQL Database"
 
-# msg_info "Setting up Hardware Acceleration"
-# if [[ "$CTTYPE" == "0" ]]; then
-#   chgrp video /dev/dri
-#   chmod 755 /dev/dri
-#   chmod 660 /dev/dri/*
-# fi
-# msg_ok "Hardware Acceleration Configured"
+msg_info "Setting up Hardware Acceleration"
+if [[ "$CTTYPE" == "0" ]]; then
+   chgrp video /dev/dri
+   chmod 755 /dev/dri
+   chmod 660 /dev/dri/*
+fi
+msg_ok "Hardware Acceleration Configured"
 
-PYTHON_VERSION="3.12" setup_uv
+PYTHON_VERSION="3.13" setup_uv
 fetch_and_deploy_gh_release "viseron" "roflcoopter/viseron" "tarball" "latest" "/opt/viseron"
 
 msg_info "Setting up Python Environment"
-uv venv --python "python3.12" /opt/viseron/.venv
+uv venv --python "python3.13" /opt/viseron/.venv
 uv pip install --python /opt/viseron/.venv/bin/python --upgrade pip setuptools wheel
 msg_ok "Python Environment Setup"
 
 msg_info "Setup Viseron (Patience)"
-if ls /dev/nvidia* >/dev/null 2>&1; then
-    msg_info "GPU detected → Installing PyTorch with CUDA"
-    UV_HTTP_TIMEOUT=600 uv pip install --python /opt/viseron/.venv/bin/python \
-        torch==2.8.0 torchvision==0.19.0 torchaudio==2.8.0
-    msg_ok "Installed Torch with CUDA"
-else
-    msg_info "No GPU detected → Installing CPU-only PyTorch"
-    UV_HTTP_TIMEOUT=600 uv pip install --python /opt/viseron/.venv/bin/python \
-        torch==2.8.0+cpu torchvision==0.19.0+cpu torchaudio==2.8.0+cpu \
-        --extra-index-url https://download.pytorch.org/whl/cpu
-    msg_ok "Installed Torch CPU-only"
-fi
-UV_HTTP_TIMEOUT=600 uv pip install --python /opt/viseron/.venv/bin/python -e /opt/viseron/.
+GPU_VENDOR=$(lspci | grep -E "VGA|3D" | grep -oE "NVIDIA|Intel|AMD" | head -n1)
+
+case "$GPU_VENDOR" in
+    NVIDIA)
+        msg_info "NVIDIA GPU detected → Installing PyTorch with CUDA"
+        UV_HTTP_TIMEOUT=1200 uv pip install --python /opt/viseron/.venv/bin/python \
+            'torch>=2.2,<3.0' 'torchvision>=0.17,<1.0' 'torchaudio>=2.2,<3.0'
+        msg_ok "Installed Torch with CUDA"
+        ;;
+    Intel)
+        msg_info "Intel GPU detected → Installing PyTorch with Intel Extension"
+        UV_HTTP_TIMEOUT=1200 uv pip install --python /opt/viseron/.venv/bin/python \
+            'torch>=2.2,<3.0' 'torchvision>=0.17,<1.0' 'torchaudio>=2.2,<3.0' \
+            intel-extension-for-pytorch
+        msg_ok "Installed Torch with Intel Extension"
+        ;;
+    AMD)
+        msg_info "AMD GPU detected → Installing PyTorch with ROCm"
+        UV_HTTP_TIMEOUT=1200 uv pip install --python /opt/viseron/.venv/bin/python \
+            'torch>=2.2,<3.0' 'torchvision>=0.17,<1.0' 'torchaudio>=2.2,<3.0' \
+            --index-url https://download.pytorch.org/whl/rocm6.0
+        msg_ok "Installed Torch with ROCm"
+        ;;
+    *)
+        msg_info "No GPU detected → Installing CPU-only PyTorch"
+        UV_HTTP_TIMEOUT=1200 uv pip install --python /opt/viseron/.venv/bin/python \
+            'torch>=2.2,<3.0' 'torchvision>=0.17,<1.0' 'torchaudio>=2.2,<3.0' \
+            --extra-index-url https://download.pytorch.org/whl/cpu
+        msg_ok "Installed Torch CPU-only"
+        ;;
+esac
+
 UV_HTTP_TIMEOUT=600 uv pip install --python /opt/viseron/.venv/bin/python -r /opt/viseron/requirements.txt
+UV_HTTP_TIMEOUT=600 uv pip install --python /opt/viseron/.venv/bin/python -e /opt/viseron/.
+
 mkdir -p /config/{recordings,snapshots,segments,event_clips,thumbnails}
-for d in recordings snapshots segments event_clips thumbnails; do ln -s "/config/$d" "/$d" 2>/dev/null || true; done
+for d in recordings snapshots segments event_clips thumbnails; do
+    ln -sfn "/config/$d" "/$d"
+done
 msg_ok "Setup Viseron"
 
 msg_info "Creating Default Configuration"