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