Merge pull request #162 from outis1one/claude/bootstrap-script-404-d8dc7h
fix whiptail navigation + add installed-service summary
This commit is contained in:
+1
-1
@@ -60,7 +60,7 @@ if [ -f "${SCRIPT_DIR}/setup.sh" ]; then
|
|||||||
&& chown -R "${SUDO_USER:-$(id -un)}:" "$DEST" 2>/dev/null || true
|
&& chown -R "${SUDO_USER:-$(id -un)}:" "$DEST" 2>/dev/null || true
|
||||||
echo ""
|
echo ""
|
||||||
fi
|
fi
|
||||||
exec bash "${SCRIPT_DIR}/setup.sh" </dev/tty
|
exec bash "${SCRIPT_DIR}/setup.sh" </dev/tty >/dev/tty 2>/dev/tty
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# ── Options 1 & 2: clone from GitHub ─────────────────────────────────────────
|
# ── Options 1 & 2: clone from GitHub ─────────────────────────────────────────
|
||||||
|
|||||||
@@ -249,9 +249,33 @@ if [ -n "${SERVICE_GROUP[caddy]:-}" ] && ! is_installed caddy; then
|
|||||||
[ "$OFFER_CADDY" = "y" ] || [ "$OFFER_CADDY" = "Y" ] && run_service caddy
|
[ "$OFFER_CADDY" = "y" ] || [ "$OFFER_CADDY" = "Y" ] && run_service caddy
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 5) Category menu loop: pick a category → checklist → install → back to menu.
|
# 5) Installed-service summary — show status before every menu session.
|
||||||
|
echo ""
|
||||||
|
echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
|
||||||
|
echo " INSTALLED SERVICES"
|
||||||
|
echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
|
||||||
|
_any_installed=false
|
||||||
|
while IFS= read -r _g; do
|
||||||
|
_group_header_printed=false
|
||||||
|
while IFS= read -r _svc; do
|
||||||
|
if is_installed "$_svc"; then
|
||||||
|
if [ "$_group_header_printed" = false ]; then
|
||||||
|
printf "\n %-12s\n" "${_g^^}"
|
||||||
|
_group_header_printed=true
|
||||||
|
fi
|
||||||
|
printf " ✓ %-20s %s\n" "$_svc" "${SERVICE_DESC[$_svc]}"
|
||||||
|
_any_installed=true
|
||||||
|
fi
|
||||||
|
done < <(services_in_group "$_g")
|
||||||
|
done < <(groups_present)
|
||||||
|
[ "$_any_installed" = false ] && echo " (none yet)"
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
# 6) Category menu loop: pick a category → checklist → install → back to menu.
|
||||||
have_whiptail=false
|
have_whiptail=false
|
||||||
command -v whiptail >/dev/null 2>&1 && have_whiptail=true
|
command -v whiptail >/dev/null 2>&1 && have_whiptail=true
|
||||||
|
# Ensure the terminal is in a clean state before handing control to whiptail.
|
||||||
|
stty sane </dev/tty 2>/dev/null || true
|
||||||
|
|
||||||
while true; do
|
while true; do
|
||||||
mapfile -t CATS < <(groups_present)
|
mapfile -t CATS < <(groups_present)
|
||||||
|
|||||||
Reference in New Issue
Block a user