Refactor: Verschachtelung im Ollama-Speicherort-Dialog reduziert

Der whiptail-Zweig verschachtelte vier Ebenen tief und verteilte drei
identische chosen="$default_path"-Zuweisungen über if/else-Paare, um
eine einzige lineare Entscheidung abzubilden. Die Ja/Nein-Abfrage und
der Eingabedialog folgen jetzt beide dem Guard-Clause-Muster
(if [[ -z "$chosen" ]]; then ... fi), das bereits für den CLI-Fallback
weiter unten in derselben Funktion verwendet wird.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017WMUd2fGsPCtTCVQkSS5TA

lib/utils.sh

@@ -135,6 +135,23 @@ run_whiptail() {
     fi
 }
 
+# Ask a yes/no question on the CLI. Returns 0 for yes, 1 for no.
+# On read failure (e.g. closed stdin), falls back to default_answer.
+# Usage: confirm_yes_no "<prompt>" "<y|n default answer>" "$tty_in" "$tty_out"
+confirm_yes_no() {
+    local prompt="$1"
+    local default_answer="$2"
+    local tty_in="$3"
+    local tty_out="$4"
+    local answer=""
+    read -r -p "$prompt" answer < "$tty_in" > "$tty_out" 2>&1 || answer="$default_answer"
+    answer="$(sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' <<< "$answer")"
+    if [[ -z "$answer" ]]; then
+        answer="$default_answer"
+    fi
+    [[ "$answer" =~ ^[YyJj] ]]
+}
+
 # Determine and prompt for the non-root target user
 prompt_target_user() {
     if [[ -n "${TARGET_USER:-}" ]]; then
@@ -173,9 +190,7 @@ prompt_target_user() {
         if [[ -n "$candidate" && "$candidate" != "root" ]]; then
             printf "\n%bTarget User Detection:%b\n" "${CLR_CYAN}" "${CLR_RESET}" > "$tty_out"
             printf "Detected target user: %b%s%b\n" "${CLR_BOLD}" "$candidate" "${CLR_RESET}" > "$tty_out"
-            local answer=""
+            if confirm_yes_no "Use target user '$candidate'? [Y/n]: " "y" "$tty_in" "$tty_out"; then
-            read -r -p "Use target user '$candidate'? [Y/n]: " answer < "$tty_in" > "$tty_out" 2>&1 || answer="y"
-            if [[ -z "$answer" || "$answer" =~ ^[YyJj] ]]; then
                 chosen="$candidate"
             fi
         fi
@@ -255,36 +270,52 @@ prompt_ollama_models_path() {
             tty_out="/dev/stderr"
         fi
 
-        # If whiptail is available and running on an active terminal, use whiptail dialog
+        # If whiptail is available and running on an active terminal, first ask
+        # whether the configured default path should be used, and only show
+        # the free-text path dialog (pre-filled with that default) if not.
         if command_exists whiptail && has_tty; then
-            local tui_tmp
+            local yesno_status=0
-            tui_tmp="$(mktemp)"
+            run_whiptail --title "Ollama KI-Modelle Speicherort" \
-            if run_whiptail --output-fd 3 --title "Ollama KI-Modelle Speicherort" \
+                --yes-button "Standard verwenden" --no-button "Eigenen Pfad angeben" \
-                --inputbox "Bitte gib den Speicherort für die Ollama KI-Modelle an:" \
+                --yesno "Standard-Speicherort für Ollama-Modelle:\n\n$default_path\n\nMöchtest du diesen Speicherort verwenden?" \
-                10 70 "$default_path" \
+                12 70 || yesno_status=$?
-                3> "$tui_tmp"; then
+            if [[ "$yesno_status" -eq 0 || "$yesno_status" -eq 255 ]]; then
-                local tui_input
+                # Yes, or ESC/Cancel (255) - use the configured default,
-                tui_input="$(sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' < "$tui_tmp")"
+                # consistent with the inputbox fallback below where an
-                if [[ -n "$tui_input" ]]; then
+                # empty or cancelled dialog also keeps the default instead
-                    chosen="$tui_input"
+                # of asking again.
-                else
+                chosen="$default_path"
-                    chosen="$default_path"
+            fi
+
+            if [[ -z "$chosen" ]]; then
+                local tui_tmp
+                tui_tmp="$(mktemp)"
+                if run_whiptail --output-fd 3 --title "Ollama KI-Modelle Speicherort" \
+                    --inputbox "Bitte gib den Speicherort für die Ollama KI-Modelle an:" \
+                    10 70 "$default_path" \
+                    3> "$tui_tmp"; then
+                    chosen="$(sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' < "$tui_tmp")"
                 fi
+                rm -f "$tui_tmp"
+                [[ -z "$chosen" ]] && chosen="$default_path"
             fi
-            rm -f "$tui_tmp"
         fi
 
         # CLI fallback if whiptail was not used or failed
         if [[ -z "$chosen" ]]; then
             printf "\n%bOllama KI-Modelle Speicherort:%b\n" "${CLR_CYAN}" "${CLR_RESET}" > "$tty_out"
             printf "Standard-Pfad: %b%s%b\n" "${CLR_BOLD}" "$default_path" "${CLR_RESET}" > "$tty_out"
-            local input_path=""
+            if confirm_yes_no "Standard-Speicherort verwenden? [J/n]: " "j" "$tty_in" "$tty_out"; then
-            read -r -p "Speicherort für Ollama-Modelle eingeben [$default_path]: " input_path < "$tty_in" > "$tty_out" 2>&1 || true
-            input_path="$(echo "$input_path" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')"
-            if [[ -n "$input_path" ]]; then
-                chosen="$input_path"
-            else
                 chosen="$default_path"
+            else
+                local input_path=""
+                read -r -p "Speicherort für Ollama-Modelle eingeben [$default_path]: " input_path < "$tty_in" > "$tty_out" 2>&1 || true
+                input_path="$(echo "$input_path" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')"
+                if [[ -n "$input_path" ]]; then
+                    chosen="$input_path"
+                else
+                    chosen="$default_path"
+                fi
             fi
         fi
     else