installer: pass dashboard tty explicitly
This commit is contained in:
2 files changed
+13
-6
No files matched your search
@@ -45,8 +45,10 @@ cd /root
|
|||||||
|
|
||||||
# Keep the actual install screen calm: the dashboard owns /dev/tty while the
|
# Keep the actual install screen calm: the dashboard owns /dev/tty while the
|
||||||
# noisy installer stream is captured to the support log.
|
# noisy installer stream is captured to the support log.
|
||||||
|
dashboard_tty=$(tty)
|
||||||
|
export OMARCHY_DASHBOARD_TTY="$dashboard_tty"
|
||||||
rm -f /run/omarchy-install/dashboard.stop
|
rm -f /run/omarchy-install/dashboard.stop
|
||||||
setsid /usr/local/bin/omarchy-install-dashboard "$OMARCHY_INSTALL_LOG_FILE" /run/omarchy-install/state.json >/dev/tty 2>&1 &
|
setsid /usr/local/bin/omarchy-install-dashboard "$OMARCHY_INSTALL_LOG_FILE" /run/omarchy-install/state.json <"$dashboard_tty" >"$dashboard_tty" 2>&1 &
|
||||||
dashboard_pid=$!
|
dashboard_pid=$!
|
||||||
export OMARCHY_INSTALL_DASHBOARD_PID="$dashboard_pid"
|
export OMARCHY_INSTALL_DASHBOARD_PID="$dashboard_pid"
|
||||||
|
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ STATE_FILE="${2:-/run/omarchy-install/state.json}"
|
|||||||
STATE_DIR="$(dirname "$STATE_FILE")"
|
STATE_DIR="$(dirname "$STATE_FILE")"
|
||||||
STOP_FILE="$STATE_DIR/dashboard.stop"
|
STOP_FILE="$STATE_DIR/dashboard.stop"
|
||||||
LOGO_PATH="${OMARCHY_PATH:-/usr/share/omarchy}/logo.txt"
|
LOGO_PATH="${OMARCHY_PATH:-/usr/share/omarchy}/logo.txt"
|
||||||
|
TTY_PATH="${OMARCHY_DASHBOARD_TTY:-/dev/tty}"
|
||||||
|
|
||||||
CSI=$'\033['
|
CSI=$'\033['
|
||||||
RESET="${CSI}0m"
|
RESET="${CSI}0m"
|
||||||
@@ -43,12 +44,12 @@ whimsy=(
|
|||||||
)
|
)
|
||||||
|
|
||||||
cleanup() {
|
cleanup() {
|
||||||
printf '%s%s' "$RESET" "$SHOW_CURSOR" >/dev/tty 2>/dev/null || true
|
printf '%s%s' "$RESET" "$SHOW_CURSOR" >"$TTY_PATH" 2>/dev/null || true
|
||||||
}
|
}
|
||||||
trap cleanup EXIT
|
trap cleanup EXIT
|
||||||
trap 'cleanup; exit 0' INT TERM
|
trap 'cleanup; exit 0' INT TERM
|
||||||
|
|
||||||
term_size() { stty size 2>/dev/null </dev/tty || printf '24 80\n'; }
|
term_size() { stty size 2>/dev/null <"$TTY_PATH" || printf '24 80\n'; }
|
||||||
term_cols() { local size; size="$(term_size)"; printf '%s\n' "${size#* }"; }
|
term_cols() { local size; size="$(term_size)"; printf '%s\n' "${size#* }"; }
|
||||||
|
|
||||||
repeat() {
|
repeat() {
|
||||||
@@ -232,12 +233,16 @@ render_dynamic() {
|
|||||||
printf '%s' "$CLEAR_TO_END"
|
printf '%s' "$CLEAR_TO_END"
|
||||||
}
|
}
|
||||||
|
|
||||||
printf '%s' "$HIDE_CURSOR" >/dev/tty
|
if [[ ! -e $TTY_PATH ]]; then
|
||||||
render_static >/dev/tty
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
printf '%s' "$HIDE_CURSOR" >"$TTY_PATH"
|
||||||
|
render_static >"$TTY_PATH"
|
||||||
frame=0
|
frame=0
|
||||||
while true; do
|
while true; do
|
||||||
[[ -e $STOP_FILE ]] && break
|
[[ -e $STOP_FILE ]] && break
|
||||||
render_dynamic "$frame" >/dev/tty
|
render_dynamic "$frame" >"$TTY_PATH"
|
||||||
if install_finished || [[ -e $STOP_FILE ]]; then
|
if install_finished || [[ -e $STOP_FILE ]]; then
|
||||||
sleep 1
|
sleep 1
|
||||||
break
|
break
|
||||||
|
|||||||
Reference in new issue
Block a user