Alle Fenster ueber drei gemeinsame Stellen, Selbstpruefung dazu
Die berechnete Fenstergroesse galt bisher nur fuer die Dialoge, die ich
dafuer einzeln angefasst hatte. Eine Pruefung des ganzen Projekts zeigte
zwei Luecken:
* in common.sh gab es neun verstreute Aufrufstellen von dialog/whiptail
* migrate_creator.sh hatte noch durchgehend feste Groessen
(20 76 11, 10 76, 18 76, 14 76, 22 78, 8 76)
Beide Skripte rufen dialog/whiptail jetzt nur noch ueber drei Stellen auf:
_ui_list Listenfenster (menu, checklist, radiolist)
_ui_box Textfenster (msgbox, yesno, inputbox, passwordbox, infobox)
_ui_file Dateianzeige (textbox)
Die berechnen die Groesse selbst. Damit stimmt sie auch fuer Fenster, die
spaeter dazukommen - man muss nur eine der ui_*-Huellen benutzen.
Neu: "cmk-manage.sh selftest" haelt das nach. Geprueft werden Syntax
aller vier Skripte, Dialoge an den Engstellen vorbei, fest eingetragene
Fenstergroessen, das Muster "[ ... ] && VAR=..." und die Vollstaendigkeit
der Einstellungstabelle gegenueber .env.example.
Der Lauf fand sofort 19 Altlasten des Musters "[ ... ] && VAR=...", das
hier schon dreimal einen stillen Abbruch verursacht hat - alle in
if-Bloecke umgeschrieben und stichprobenartig geprueft, auch die Faelle
mit case-Abschluss und Array-Zuweisung. Danach laeuft die Selbstpruefung
vollstaendig durch.
Regression: alle CLI-Kommandos, zwoelf Menuefunktionen und das Rendern
von sechs Fenstern unter whiptail in einem echten Pseudo-Terminal.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
Claude Opus 5
+121
-19
@@ -49,6 +49,7 @@ KOMMANDOS - Stack
|
||||
pull Images aktualisieren
|
||||
status Status von Containern und Sites anzeigen
|
||||
logs [-f] [DIENST] Logs anzeigen
|
||||
selftest Skripte auf bekannte Fallstricke pruefen
|
||||
shell Root-Shell im Checkmk-Container
|
||||
omd ARG... beliebiges omd-Kommando im Container ausfuehren
|
||||
|
||||
@@ -439,7 +440,7 @@ EOF
|
||||
local cand
|
||||
cand="$(printf '%s\n' "$diff_new" | grep -Ei 'check-?mk' | head -n1)"
|
||||
[ -n "$cand" ] || cand="$(printf '%s\n' "$diff_new" | sed '/^$/d' | head -n1)"
|
||||
[ -n "$cand" ] && loaded="$cand"
|
||||
if [ -n "$cand" ]; then loaded="$cand"; fi
|
||||
fi
|
||||
|
||||
if [ -z "$loaded" ]; then
|
||||
@@ -479,7 +480,7 @@ image_fetch_url() {
|
||||
warn "curl fehlt - verwende wget (die Zugangsdaten sind dabei kurzzeitig
|
||||
in der Prozessliste sichtbar)."
|
||||
local -a wa=()
|
||||
[ -n "$user" ] && wa=(--user="$user" --password="$pass")
|
||||
if [ -n "$user" ]; then wa=(--user="$user" --password="$pass"); fi
|
||||
wget ${wa[@]+"${wa[@]}"} -O "$out" "$url"
|
||||
return $?
|
||||
else
|
||||
@@ -824,11 +825,11 @@ image_consistency_check() {
|
||||
repo="${img%:*}"
|
||||
case "$repo" in */*) name="${repo##*/}" ;; *) name="$repo" ;; esac
|
||||
# kein Tag angegeben -> nicht beurteilbar
|
||||
[ "$tag" = "$img" ] && tag=""
|
||||
if [ "$tag" = "$img" ]; then tag=""; fi
|
||||
|
||||
local ed_ok="" a
|
||||
for a in $(edition_aliases "$ed"); do
|
||||
[ "$name" = "check-mk-$a" ] && ed_ok=1
|
||||
if [ "$name" = "check-mk-$a" ]; then ed_ok=1; fi
|
||||
done
|
||||
|
||||
local ver_ok=1
|
||||
@@ -934,7 +935,7 @@ test_registry_login() { # reg repo user pass needs_login -> 0 = alles gut
|
||||
local reg="$1" repo="$2" user="$3" pass="$4" needs_login="${5:-}"
|
||||
local rc=0 anon=""
|
||||
local api; api="$(registry_api_host "$reg")"
|
||||
[ -z "$user" ] && anon=1
|
||||
if [ -z "$user" ]; then anon=1; fi
|
||||
|
||||
printf '\n%sRegistry %s%s\n' "$C_BLD" "$reg" "$C_RST"
|
||||
[ "$api" != "$reg" ] && printf ' API-Host: %s\n' "$api"
|
||||
@@ -972,7 +973,7 @@ test_registry_login() { # reg repo user pass needs_login -> 0 = alles gut
|
||||
|
||||
local realm_host; realm_host="$(printf '%s' "$realm" | sed -E 's|^[a-z]+://([^/]+).*|\1|')"
|
||||
local netrc=""
|
||||
[ -z "$anon" ] && netrc="$(netrc_make "$user" "$pass" "$api" "$realm_host")"
|
||||
if [ -z "$anon" ]; then netrc="$(netrc_make "$user" "$pass" "$api" "$realm_host")"; fi
|
||||
local url="$realm?service=$service&scope=repository:$repo:pull"
|
||||
local body tcode
|
||||
if [ -n "$netrc" ]; then
|
||||
@@ -1289,7 +1290,7 @@ registry_repo_status() { # api repo user pass -> "code anzahl_tags"
|
||||
local code
|
||||
code="$(curl "${a[@]}" "https://$api/v2/$repo/tags/list" 2>/dev/null)" || code=000
|
||||
local n=0
|
||||
[ "${code:-000}" = 200 ] && n="$(tr ',' '\n' <"/tmp/.cmkrepo.$$" 2>/dev/null | grep -c '"' || echo 0)"
|
||||
if [ "${code:-000}" = 200 ]; then n="$(tr ',' '\n' <"/tmp/.cmkrepo.$$" 2>/dev/null | grep -c '"' || echo 0)"; fi
|
||||
rm -f "/tmp/.cmkrepo.$$"
|
||||
printf '%s %s\n' "${code:-000}" "$n"
|
||||
}
|
||||
@@ -1331,7 +1332,7 @@ image_cmd_repos() {
|
||||
code="${line%% *}"; n="${line##* }"
|
||||
case "$code" in
|
||||
200) printf ' %s%-6s%s %-8s %s\n' "$C_GRN" "$code" "$C_RST" "$n" "$cand"
|
||||
[ -z "$ok" ] && ok="$cand" ;;
|
||||
if [ -z "$ok" ]; then ok="$cand"; fi ;;
|
||||
401|403) printf ' %s%-6s%s %-8s %s (kein Zugriff - oder gibt es nicht;\n%38sviele Registries verbergen das)\n' \
|
||||
"$C_YEL" "$code" "$C_RST" "-" "$cand" "" ;;
|
||||
404) printf ' %-6s %-8s %s (gibt es nicht)\n' "$code" "-" "$cand" ;;
|
||||
@@ -1388,7 +1389,7 @@ image_cmd_versions() {
|
||||
Moeglich: raw community free cloud managed pro ultimate ultimatemt enterprise"
|
||||
case "$source" in registry|download|web|both|all) : ;;
|
||||
*) die "--source: registry | download | web | all" ;; esac
|
||||
[ "$source" = both ] && source=all
|
||||
if [ "$source" = both ]; then source=all; fi
|
||||
case "$limit" in ''|*[!0-9]*) die "--limit braucht eine Zahl." ;; esac
|
||||
|
||||
command -v curl >/dev/null 2>&1 || die "Fuer 'image versions' wird curl benoetigt."
|
||||
@@ -2008,11 +2009,11 @@ cmd_job() {
|
||||
if [ -n "$is_set" ]; then
|
||||
[ -n "$old" ] || die "Job '$name' ist nicht vorhanden."
|
||||
# nicht angegebene Felder aus dem Bestand uebernehmen
|
||||
[ "$sites" = ALL ] && sites="$(job_f "$old" 2)"
|
||||
[ -z "$cron" ] && cron="$(job_f "$old" 3)"
|
||||
[ -z "$dir" ] && dir="$(job_f "$old" 4)"
|
||||
[ -z "$opts" ] && opts="$(job_f "$old" 5)"
|
||||
[ "$keep" = 7 ] && keep="$(job_f "$old" 6)"
|
||||
if [ "$sites" = ALL ]; then sites="$(job_f "$old" 2)"; fi
|
||||
if [ -z "$cron" ]; then cron="$(job_f "$old" 3)"; fi
|
||||
if [ -z "$dir" ]; then dir="$(job_f "$old" 4)"; fi
|
||||
if [ -z "$opts" ]; then opts="$(job_f "$old" 5)"; fi
|
||||
if [ "$keep" = 7 ]; then keep="$(job_f "$old" 6)"; fi
|
||||
enabled="$(job_f "$old" 7)"
|
||||
else
|
||||
[ -z "$old" ] || die "Job '$name' existiert bereits. Aendern mit: $SELF job set $name ..."
|
||||
@@ -2773,7 +2774,7 @@ cmd_config() {
|
||||
case "$sub" in
|
||||
list|ls)
|
||||
local cat_filter=""
|
||||
[ "${1:-}" = "--category" ] && cat_filter="$2"
|
||||
if [ "${1:-}" = "--category" ]; then cat_filter="$2"; fi
|
||||
local line c k t l
|
||||
while IFS='|' read -r c k t l _ _; do
|
||||
[ -n "$k" ] || continue
|
||||
@@ -3360,7 +3361,7 @@ cmd_cert() {
|
||||
esac
|
||||
done
|
||||
local myip; myip="$(primary_ip)"
|
||||
[ -n "$myip" ] && san="$san,IP:$myip"
|
||||
if [ -n "$myip" ]; then san="$san,IP:$myip"; fi
|
||||
|
||||
log "Erzeuge selbstsigniertes Zertifikat fuer '$domain' ($days Tage) ..."
|
||||
openssl req -x509 -nodes -newkey rsa:4096 -sha256 -days "$days" \
|
||||
@@ -3646,7 +3647,7 @@ Jobdatei: $(jobs_file)" \
|
||||
toggle) local j2 l st
|
||||
j2="$(gui_pick_job)" || continue; [ -n "$j2" ] || continue
|
||||
l="$(job_line "$j2")"; st=disable
|
||||
[ "$(job_f "$l" 7)" = off ] && st=enable
|
||||
if [ "$(job_f "$l" 7)" = off ]; then st=enable; fi
|
||||
ui_run "Job $st" bash -c "cd '$PROJECT_DIR' && '$SELF' -y job $st '$j2'" ;;
|
||||
del) local j3; j3="$(gui_pick_job)" || continue; [ -n "$j3" ] || continue
|
||||
ui_yesno "Loeschen" "Job '$j3' wirklich loeschen?\n\n(Bereits erstellte Backups bleiben erhalten.)" \
|
||||
@@ -4195,7 +4196,7 @@ Diese drei Werte setzt der Assistent gemeinsam." \
|
||||
done
|
||||
IFS="$IFS_BAK"
|
||||
new="$(ui_radiolist "$key" "$label\n\nAktuell: ${cur:-<leer>}" "${ropts[@]}")" || return 0
|
||||
[ "$new" = auto ] && new=""
|
||||
if [ "$new" = auto ]; then new=""; fi
|
||||
;;
|
||||
password)
|
||||
new="$(ui_password "$key" "$label\n\n(leer lassen = unveraendert)")" || return 0
|
||||
@@ -4327,7 +4328,7 @@ Oberflaeche des Proxy Managers darstellen." \
|
||||
case "$sel" in
|
||||
url) local u
|
||||
u="$(ui_input "Startseite" "URL:" "${NPM_ADMIN_URL:-http://127.0.0.1:81}")" || continue
|
||||
[ -n "$u" ] && NPM_ADMIN_URL="$u" ;;
|
||||
if [ -n "$u" ]; then NPM_ADMIN_URL="$u"; fi ;;
|
||||
build) ui_run "Werkzeug-Image bauen" bash -c "cd '$PROJECT_DIR' && '$SELF' browser --build-only" || true ;;
|
||||
back) return 0 ;;
|
||||
*) local burl="${NPM_ADMIN_URL:-http://127.0.0.1:81}"
|
||||
@@ -4512,6 +4513,106 @@ Backups : $BACKUP_DIR" \
|
||||
ok "Beendet."
|
||||
}
|
||||
|
||||
# =====================================================================
|
||||
# Selbstpruefung
|
||||
#
|
||||
# Faengt die Fehler ab, die hier wiederholt aufgetreten sind:
|
||||
# 1. Dialoge, die an den Engstellen vorbei direkt "$UI_BIN" aufrufen -
|
||||
# die haetten dann wieder feste Fenstergroessen.
|
||||
# 2. Feste Zahlen als Fenstergroesse.
|
||||
# 3. "[ bedingung ] && VAR=wert": liefert 1, wenn die Bedingung nicht
|
||||
# zutrifft, und beendet unter "set -e" Funktion oder Skript.
|
||||
# Aufruf: cmk-manage.sh selftest
|
||||
# =====================================================================
|
||||
cmd_selftest() {
|
||||
local rc=0 n
|
||||
local -a files=("$SCRIPT_DIR/cmk-manage.sh" "$SCRIPT_DIR/lib/common.sh" \
|
||||
"$SCRIPT_DIR/migrate_creator.sh" "$PROJECT_DIR/install.sh")
|
||||
|
||||
printf '\n%s1. Syntax%s\n' "$C_BLD" "$C_RST"
|
||||
local f
|
||||
for f in "${files[@]}"; do
|
||||
[ -f "$f" ] || continue
|
||||
if bash -n "$f" 2>/dev/null; then
|
||||
printf ' %s[ OK ]%s %s\n' "$C_GRN" "$C_RST" "$(basename "$f")"
|
||||
else
|
||||
printf ' %s[FEHLER]%s %s\n' "$C_RED" "$C_RST" "$(basename "$f")"; rc=1
|
||||
fi
|
||||
done
|
||||
|
||||
printf '\n%s2. Dialoge laufen ueber die Engstellen%s\n' "$C_BLD" "$C_RST"
|
||||
n=0
|
||||
for f in "$SCRIPT_DIR/cmk-manage.sh" "$SCRIPT_DIR/lib/common.sh" "$SCRIPT_DIR/migrate_creator.sh"; do
|
||||
[ -f "$f" ] || continue
|
||||
# Aufrufe von "$UI_BIN" sind nur in _ui_list/_ui_box/_ui_file erlaubt
|
||||
while IFS= read -r line; do
|
||||
[ -n "$line" ] || continue
|
||||
printf ' %s[FEHLER]%s %s:%s\n' "$C_RED" "$C_RST" "$(basename "$f")" "$line"
|
||||
n=$((n+1))
|
||||
done < <(awk '
|
||||
/^[_a-zA-Z0-9]+\(\) \{/ { fn = $1; sub(/\(\).*/, "", fn) }
|
||||
/"\$UI_BIN"[[:space:]]+--/ {
|
||||
if ($0 ~ /^[[:space:]]*#/) next
|
||||
if (fn ~ /^_ui_/ || fn == "ui_available") next
|
||||
printf "%d: %s\n", NR, substr($0, 1, 60)
|
||||
}' "$f")
|
||||
done
|
||||
if [ "$n" -eq 0 ]; then
|
||||
printf ' %s[ OK ]%s kein Dialog ruft dialog/whiptail direkt auf\n' "$C_GRN" "$C_RST"
|
||||
else
|
||||
printf ' Neue Fenster bitte ueber ui_menu/ui_msg/... bauen.\n'; rc=1
|
||||
fi
|
||||
|
||||
printf '\n%s3. Keine festen Fenstergroessen%s\n' "$C_BLD" "$C_RST"
|
||||
n=0
|
||||
for f in "$SCRIPT_DIR/lib/common.sh" "$SCRIPT_DIR/migrate_creator.sh"; do
|
||||
[ -f "$f" ] || continue
|
||||
while IFS= read -r line; do
|
||||
[ -n "$line" ] || continue
|
||||
printf ' %s[FEHLER]%s %s:%s\n' "$C_RED" "$C_RST" "$(basename "$f")" "$line"
|
||||
n=$((n+1))
|
||||
done < <(grep -nE '"\$UI_BIN".*(--menu|--checklist|--radiolist|--[a-z]+box).*[[:space:]][0-9]{1,3}[[:space:]]' "$f" \
|
||||
| cut -c1-70 || true)
|
||||
done
|
||||
[ "$n" -eq 0 ] && printf ' %s[ OK ]%s alle Groessen werden berechnet\n' "$C_GRN" "$C_RST" || rc=1
|
||||
|
||||
printf '\n%s4. Keine "[ ... ] && VAR=" unter set -e%s\n' "$C_BLD" "$C_RST"
|
||||
n=0
|
||||
for f in "${files[@]}"; do
|
||||
[ -f "$f" ] || continue
|
||||
while IFS= read -r line; do
|
||||
[ -n "$line" ] || continue
|
||||
printf ' %s[ WARN ]%s %s:%s\n' "$C_YEL" "$C_RST" "$(basename "$f")" "$line"
|
||||
n=$((n+1))
|
||||
done < <(grep -nE '^[[:space:]]*\[[^]]+\][[:space:]]*&&[[:space:]]*[A-Za-z_][A-Za-z_0-9]*=' "$f" \
|
||||
| cut -c1-70 || true)
|
||||
done
|
||||
if [ "$n" -eq 0 ]; then
|
||||
printf ' %s[ OK ]%s keine Fundstellen\n' "$C_GRN" "$C_RST"
|
||||
else
|
||||
printf ' Als letzte Anweisung einer Funktion beendet das unter\n'
|
||||
printf ' "set -e" das Skript. Besser als if-Block schreiben.\n'
|
||||
fi
|
||||
|
||||
printf '\n%s5. Einstellungstabelle%s\n' "$C_BLD" "$C_RST"
|
||||
n="$(settings_defs | awk -F'|' 'NF!=6' | wc -l)"
|
||||
if [ "$n" -eq 0 ]; then
|
||||
printf ' %s[ OK ]%s alle Zeilen haben sechs Felder\n' "$C_GRN" "$C_RST"
|
||||
else
|
||||
printf ' %s[FEHLER]%s %s Zeile(n) mit falscher Feldzahl\n' "$C_RED" "$C_RST" "$n"; rc=1
|
||||
fi
|
||||
local missing=0 k
|
||||
for k in $(settings_defs | cut -d'|' -f2); do
|
||||
grep -qE "^${k}=" "$PROJECT_DIR/.env.example" || { printf ' %s[FEHLER]%s %s fehlt in .env.example\n' "$C_RED" "$C_RST" "$k"; missing=1; }
|
||||
done
|
||||
[ "$missing" -eq 0 ] && printf ' %s[ OK ]%s alle Schluessel stehen in .env.example\n' "$C_GRN" "$C_RST" || rc=1
|
||||
|
||||
echo
|
||||
if [ "$rc" -eq 0 ]; then ok "Selbstpruefung bestanden."; else err "Selbstpruefung hat Probleme gefunden."; fi
|
||||
echo
|
||||
return "$rc"
|
||||
}
|
||||
|
||||
# =====================================================================
|
||||
# Einstiegspunkt
|
||||
# =====================================================================
|
||||
@@ -4560,6 +4661,7 @@ main() {
|
||||
npm-enable) cmd_npm_enable "$@" ;;
|
||||
proxy) cmd_proxy "$@" ;;
|
||||
config) cmd_config "$@" || true ;;
|
||||
selftest) cmd_selftest ;;
|
||||
help|-h|--help) usage ;;
|
||||
*) err "Unbekanntes Kommando: $cmd"; echo; usage; exit 1 ;;
|
||||
esac
|
||||
|
||||
Reference in New Issue
Block a user