installer: harden dashboard handoff
This commit is contained in:
4 files changed
+235
-93
No files matched your search
@@ -1,27 +1,24 @@
|
||||
#!/usr/bin/env bash
|
||||
# Render the live Omarchy install dashboard on tty1 while installer output is
|
||||
# captured to logs. Intentionally has no external UI dependencies.
|
||||
# captured to logs. This is presentation only: it must never read input or gate
|
||||
# install completion.
|
||||
set -euo pipefail
|
||||
|
||||
LOG_FILE="${1:-/var/log/omarchy-install.log}"
|
||||
STATE_FILE="${2:-/run/omarchy-install/state.json}"
|
||||
TARGET_LOG_FILE="${3:-/mnt/var/log/omarchy-install.log}"
|
||||
LOGO_PATH="${OMARCHY_PATH:-/usr/share/omarchy}/logo.txt"
|
||||
|
||||
CSI=$'\033['
|
||||
RESET="${CSI}0m"
|
||||
BOLD="${CSI}1m"
|
||||
DIM="${CSI}2m"
|
||||
HIDE_CURSOR="${CSI}?25l"
|
||||
SHOW_CURSOR="${CSI}?25h"
|
||||
CLEAR="${CSI}2J${CSI}H"
|
||||
HOME="${CSI}H"
|
||||
CLEAR_LINE="${CSI}2K"
|
||||
CLEAR_TO_END="${CSI}J"
|
||||
# Use the 16-color ANSI palette configured by .automated_script.sh. The Linux
|
||||
# VT does not reliably map 256-color indexes the same way terminal emulators do.
|
||||
GREEN="${CSI}32m"
|
||||
GRAY="${CSI}37m"
|
||||
DARK="${CSI}90m"
|
||||
|
||||
whimsy=(
|
||||
@@ -46,20 +43,14 @@ whimsy=(
|
||||
cleanup() {
|
||||
printf '%s%s' "$RESET" "$SHOW_CURSOR" >/dev/tty 2>/dev/null || true
|
||||
}
|
||||
trap cleanup EXIT INT TERM
|
||||
trap cleanup EXIT
|
||||
trap 'cleanup; exit 0' INT TERM
|
||||
|
||||
term_size() {
|
||||
stty size 2>/dev/null </dev/tty || printf '24 80\n'
|
||||
}
|
||||
|
||||
term_cols() {
|
||||
local size
|
||||
size="$(term_size)"
|
||||
printf '%s\n' "${size#* }"
|
||||
}
|
||||
term_size() { stty size 2>/dev/null </dev/tty || printf '24 80\n'; }
|
||||
term_cols() { local size; size="$(term_size)"; printf '%s\n' "${size#* }"; }
|
||||
|
||||
repeat() {
|
||||
local char="$1" count="$2" out=""
|
||||
local char="$1" count="$2" out="" i
|
||||
for ((i=0; i<count; i++)); do out+="$char"; done
|
||||
printf '%s' "$out"
|
||||
}
|
||||
@@ -72,9 +63,21 @@ logo_width() {
|
||||
fi
|
||||
}
|
||||
|
||||
logo_height() {
|
||||
if [[ -f $LOGO_PATH ]]; then
|
||||
wc -l <"$LOGO_PATH"
|
||||
else
|
||||
printf '1\n'
|
||||
fi
|
||||
}
|
||||
|
||||
LOGO_WIDTH="$(logo_width)"
|
||||
LOGO_HEIGHT="$(logo_height)"
|
||||
(( LOGO_WIDTH > 0 )) || LOGO_WIDTH=81
|
||||
(( LOGO_HEIGHT > 0 )) || LOGO_HEIGHT=1
|
||||
CONTENT_WIDTH="$LOGO_WIDTH"
|
||||
DYNAMIC_ROW=$((LOGO_HEIGHT + 3))
|
||||
LAST_PCT=1
|
||||
|
||||
left_padding() {
|
||||
local width="${1:-$CONTENT_WIDTH}" cols pad
|
||||
@@ -90,9 +93,7 @@ visible_len() {
|
||||
printf '%s' "${#text}"
|
||||
}
|
||||
|
||||
blank_line() {
|
||||
printf '\r%s\n' "$CLEAR_LINE"
|
||||
}
|
||||
blank_line() { printf '\r%s\n' "$CLEAR_LINE"; }
|
||||
|
||||
line_at() {
|
||||
local width="${1:-$CONTENT_WIDTH}" indent="${2:-0}"
|
||||
@@ -134,50 +135,41 @@ install_progress() {
|
||||
[[ -f $STATE_FILE ]] || { printf '1'; return; }
|
||||
python - "$STATE_FILE" <<'PY' 2>/dev/null || printf '1'
|
||||
import json, sys, time
|
||||
|
||||
path = sys.argv[1]
|
||||
try:
|
||||
with open(path) as f:
|
||||
state = json.load(f)
|
||||
state = json.load(open(path))
|
||||
except Exception:
|
||||
print(1, end='')
|
||||
raise SystemExit
|
||||
|
||||
phase = state.get('current_phase') or 'Starting installation'
|
||||
if state.get('finished_at') or phase == 'Installation complete':
|
||||
print(100, end='')
|
||||
raise SystemExit
|
||||
|
||||
# Internal weighting only. The user sees one Omarchy install bar, but the bar
|
||||
# moves according to where the orchestrator is in the real install.
|
||||
# Internal weighting only. Keep estimates conservative but close to observed
|
||||
# ISO installs so the bar does not sit at 12% then jump to 90%.
|
||||
weights = [
|
||||
('Starting installation', 1, 2, 3),
|
||||
('Preparing live environment', 2, 5, 10),
|
||||
('Verifying protected mounts', 5, 8, 10),
|
||||
('Installing Arch + Omarchy', 8, 86, 1500),
|
||||
('Installing base system', 8, 86, 1500),
|
||||
('Configuring protected boot', 86, 90, 20),
|
||||
('Finalizing in chroot', 90, 96, 180),
|
||||
('Configuring login', 96, 98, 10),
|
||||
('Validating protected boot setup', 98, 99, 10),
|
||||
('Validating boot setup', 98, 99, 10),
|
||||
('Finishing', 99, 100, 5),
|
||||
('Starting installation', 1, 2, 2),
|
||||
('Preparing live environment', 2, 6, 5),
|
||||
('Verifying protected mounts', 6, 8, 3),
|
||||
('Installing Arch + Omarchy', 8, 86, 80),
|
||||
('Installing base system', 8, 86, 80),
|
||||
('Configuring protected boot', 86, 90, 8),
|
||||
('Finalizing in chroot', 90, 96, 25),
|
||||
('Configuring login', 96, 97, 3),
|
||||
('Validating protected boot setup', 97, 99, 5),
|
||||
('Validating boot setup', 97, 99, 5),
|
||||
('Finishing', 99, 100, 3),
|
||||
]
|
||||
|
||||
start, end, expected = 1, 99, 600
|
||||
start, end, expected = 1, 99, 90
|
||||
for name, s, e, seconds in weights:
|
||||
if phase == name:
|
||||
start, end, expected = s, e, seconds
|
||||
break
|
||||
|
||||
phase_started = state.get('phase_started_at') or state.get('started_at') or time.time()
|
||||
elapsed = max(0, time.time() - float(phase_started))
|
||||
span = max(0, end - start)
|
||||
# Move monotonically through most of the current phase, but leave the last
|
||||
# point for the actual phase transition so the bar never needs to go backward.
|
||||
active = min(max(span - 1, 0), int((elapsed / max(expected, 1)) * span))
|
||||
pct = min(100, start + active)
|
||||
print(pct, end='')
|
||||
print(min(100, start + active), end='')
|
||||
PY
|
||||
}
|
||||
|
||||
@@ -193,62 +185,45 @@ raise SystemExit(0 if state.get('finished_at') else 1)
|
||||
PY
|
||||
}
|
||||
|
||||
last_log_line() {
|
||||
local file line files
|
||||
if [[ -s $TARGET_LOG_FILE && $TARGET_LOG_FILE -nt $LOG_FILE ]]; then
|
||||
files=("$TARGET_LOG_FILE" "$LOG_FILE")
|
||||
else
|
||||
files=("$LOG_FILE" "$TARGET_LOG_FILE")
|
||||
fi
|
||||
|
||||
for file in "${files[@]}"; do
|
||||
[[ -s $file ]] || continue
|
||||
line="$(grep -avE '^(\s*|===|\[.*\] (Starting|Completed):)' "$file" 2>/dev/null | tail -n 1 || true)"
|
||||
if [[ -n $line ]]; then
|
||||
line="${line//$'\r'/}"
|
||||
line="$(printf '%s' "$line" | sed -E 's/\x1b\[[0-9;?]*[A-Za-z]//g')"
|
||||
printf '%s' "${line:0:$((CONTENT_WIDTH - 8))}"
|
||||
return
|
||||
fi
|
||||
done
|
||||
printf 'starting installer'
|
||||
}
|
||||
|
||||
current_whimsy() {
|
||||
local frame="$1" pct="$2"
|
||||
printf '%s' "${whimsy[$(( (pct / 8 + frame / 8) % ${#whimsy[@]} ))]}"
|
||||
}
|
||||
|
||||
render() {
|
||||
local frame="$1" pct spin log_line
|
||||
pct="$(install_progress)"
|
||||
[[ $pct =~ ^[0-9]+$ ]] || pct=1
|
||||
(( pct > 100 )) && pct=100
|
||||
spin=("◐" "◓" "◑" "◒")
|
||||
log_line="$(last_log_line)"
|
||||
|
||||
printf '%s' "$HOME"
|
||||
render_static() {
|
||||
printf '%s' "$CLEAR"
|
||||
blank_line
|
||||
render_logo
|
||||
blank_line
|
||||
}
|
||||
|
||||
render_dynamic() {
|
||||
local frame="$1" pct spin
|
||||
pct="$(install_progress)"
|
||||
[[ $pct =~ ^[0-9]+$ ]] || pct=$LAST_PCT
|
||||
(( pct > 100 )) && pct=100
|
||||
(( pct < LAST_PCT )) && pct=$LAST_PCT
|
||||
LAST_PCT=$pct
|
||||
spin=("◐" "◓" "◑" "◒")
|
||||
|
||||
printf '%s%d;1H' "$CSI" "$DYNAMIC_ROW"
|
||||
center "Installing Omarchy" "$CONTENT_WIDTH"
|
||||
blank_line
|
||||
line_at "$CONTENT_WIDTH" $(( (CONTENT_WIDTH - 40) / 2 )) ""
|
||||
progress_bar "$pct" 34
|
||||
printf '\n'
|
||||
blank_line
|
||||
center "Now: $log_line" "$CONTENT_WIDTH"
|
||||
blank_line
|
||||
center "${GREEN}${spin[$((frame % 4))]} $(current_whimsy "$frame" "$pct") ${RESET}" "$CONTENT_WIDTH"
|
||||
blank_line
|
||||
center "${DIM}Logs are being saved for support${RESET}" "$CONTENT_WIDTH"
|
||||
printf '%s' "$CLEAR_TO_END"
|
||||
}
|
||||
|
||||
printf '%s%s' "$HIDE_CURSOR" "$CLEAR" >/dev/tty
|
||||
printf '%s' "$HIDE_CURSOR" >/dev/tty
|
||||
render_static >/dev/tty
|
||||
frame=0
|
||||
while true; do
|
||||
render "$frame" >/dev/tty
|
||||
render_dynamic "$frame" >/dev/tty
|
||||
if install_finished; then
|
||||
sleep 1
|
||||
break
|
||||
|
||||
Reference in new issue
Block a user