From edbe291389754e8e67b4923f97535722d496f1f9 Mon Sep 17 00:00:00 2001
From: mboehmlaender <mboehmlaender@gmx.net>
Date: Wed, 29 Apr 2026 10:33:01 +0000
Subject: [PATCH] 0.16.1-2 Setup Fix

---
 setup.sh | 51 ++++++++++++++++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/setup.sh b/setup.sh
index 38979e7..cfc55f5 100644
--- a/setup.sh
+++ b/setup.sh
@@ -11,37 +11,35 @@ usage() {
 Verwendung:
   bash setup.sh [Optionen]
 
-Optionen (wie install.sh):
-  --branch <branch>     Branch direkt setzen (ohne Auswahlmenue)
-  --dir <pfad>          Installationsverzeichnis
-  --user <benutzer>     Systembenutzer fuer den Dienst
-  --port <port>         Backend-Port
-  --host <hostname>     Hostname/IP fuer die Weboberflaeche
-  --no-makemkv          MakeMKV-Installation ueberspringen
-  --no-handbrake        HandBrake-Installation ueberspringen
-  --no-nginx            Nginx-Einrichtung ueberspringen
-  --reinstall           Vorhandene Installation aktualisieren
+Optionen:
+  --branch <branch>     Branch fuer den Download von install.sh setzen
+  --help                Hilfe anzeigen
+
+Alle weiteren Parameter werden unveraendert an install.sh weitergegeben.
+Welche Parameter gueltig sind, entscheidet ausschliesslich install.sh.
   -h, --help            Hilfe anzeigen
 EOF
 }
 
 SELECTED_BRANCH=""
-FORWARDED_ARGS=()
+USER_PROVIDED_BRANCH=false
+ORIGINAL_ARGS=("$@")
 
 while [[ $# -gt 0 ]]; do
   case "$1" in
     --branch)
       [[ $# -ge 2 ]] || { echo "Fehlender Wert fuer --branch" >&2; exit 1; }
+      USER_PROVIDED_BRANCH=true
       SELECTED_BRANCH="$2"
       shift 2
       ;;
-    --dir|--user|--port|--host)
-      [[ $# -ge 2 ]] || { echo "Fehlender Wert fuer $1" >&2; exit 1; }
-      FORWARDED_ARGS+=("$1" "$2")
-      shift 2
-      ;;
-    --no-makemkv|--no-handbrake|--no-nginx|--reinstall)
-      FORWARDED_ARGS+=("$1")
+    --branch=*)
+      USER_PROVIDED_BRANCH=true
+      SELECTED_BRANCH="${1#--branch=}"
+      if [[ -z "$SELECTED_BRANCH" ]]; then
+        echo "Fehlender Wert fuer --branch" >&2
+        exit 1
+      fi
       shift
       ;;
     -h|--help)
@@ -49,9 +47,8 @@ while [[ $# -gt 0 ]]; do
       exit 0
       ;;
     *)
-      echo "Unbekannter Parameter: $1" >&2
-      usage >&2
-      exit 1
+      # setup.sh wertet nur --branch aus; alles andere verarbeitet install.sh
+      shift
       ;;
   esac
 done
@@ -144,11 +141,19 @@ download_file "$INSTALL_URL" "$INSTALL_SCRIPT"
 chmod +x "$INSTALL_SCRIPT"
 
 if [[ $EUID -eq 0 ]]; then
-  bash "$INSTALL_SCRIPT" --branch "$SELECTED_BRANCH" "${FORWARDED_ARGS[@]}"
+  if [[ "$USER_PROVIDED_BRANCH" == true ]]; then
+    bash "$INSTALL_SCRIPT" "${ORIGINAL_ARGS[@]}"
+  else
+    bash "$INSTALL_SCRIPT" "${ORIGINAL_ARGS[@]}" --branch "$SELECTED_BRANCH"
+  fi
 else
   if ! command -v sudo >/dev/null 2>&1; then
     echo "sudo nicht gefunden. Bitte als root ausführen." >&2
     exit 1
   fi
-  sudo bash "$INSTALL_SCRIPT" --branch "$SELECTED_BRANCH" "${FORWARDED_ARGS[@]}"
+  if [[ "$USER_PROVIDED_BRANCH" == true ]]; then
+    sudo bash "$INSTALL_SCRIPT" "${ORIGINAL_ARGS[@]}"
+  else
+    sudo bash "$INSTALL_SCRIPT" "${ORIGINAL_ARGS[@]}" --branch "$SELECTED_BRANCH"
+  fi
 fi