diff --git a/install-wings.sh b/install-wings.sh index 7e4c922..9ff0adc 100644 --- a/install-wings.sh +++ b/install-wings.sh @@ -34,9 +34,19 @@ need_tty() { prompt() { local msg="$1" - local out + local out line printf "${BOLD}%s${RESET}" "$msg" >"$TTY" IFS= read -r out <"$TTY" + + # A pasted value (e.g. join-data copied from the panel UI) can arrive with an + # embedded newline. `read` stops at the first one, which would otherwise + # silently truncate the rest onto a "phantom" line consumed by a later + # prompt. Drain any additional lines that are already buffered so nothing + # gets lost; this never blocks waiting on new keystrokes. + while IFS= read -r -t 0.1 line <"$TTY" 2>/dev/null; do + out+="$line" + done + printf "%s" "$out" } @@ -223,7 +233,8 @@ section "Configuration" # Pulls just the base64 join-data token out of whatever the user pastes. # Accepts: # - the raw token by itself -# - the full "wings configure --join-data " command +# - the full "calagopus-wings configure --join-data " command as +# generated by the panel (or the older "wings configure --join-data ..." form) # - either wrapped in single/double quotes, with extra surrounding whitespace extract_join_data() { local raw="$1" @@ -248,7 +259,7 @@ extract_join_data() { } if confirm_default_no "Run wings configure --join-data now?"; then - JOIN_DATA_RAW="$(prompt "Paste join-data (raw token or the full 'wings configure --join-data ...' command): ")" + JOIN_DATA_RAW="$(prompt "Paste join-data (raw token or the full 'calagopus-wings configure --join-data ...' command): ")" JOIN_DATA="$(extract_join_data "$JOIN_DATA_RAW")" if [[ -n "$JOIN_DATA" ]]; then