apps/quiz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(deploy): only reattach /dev/tty when actually prompting for password

Browse Source 
Unconditional 'exec < /dev/tty' broke non-interactive SSH invocations
where /dev/tty isn't openable. Move the reattach into the env-prompt
branch and skip it cleanly if /root/.quiz.env was pre-populated, with
a clear error if both stdin and /root/.quiz.env are missing.
This commit is contained in:
ameer
2026-05-02 20:29:51 +08:00
parent 7001a51803
commit 32c531247d
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
deploy/bootstrap.sh
View File

@@ -12,10 +12,6 @@
set -euo pipefail set -euo pipefail
# When invoked through curl|bash, stdin is the pipe, not the TTY.
# Reattach TTY so `read -s` works for the password prompt.
[ -t 0 ] || exec < /dev/tty
REPO_URL="${REPO_URL:-https://gitea.ahkhan.me/apps/quiz.git}" REPO_URL="${REPO_URL:-https://gitea.ahkhan.me/apps/quiz.git}"
APP_DIR="${APP_DIR:-/opt/quiz}" APP_DIR="${APP_DIR:-/opt/quiz}"
APP_USER="${APP_USER:-quiz}" APP_USER="${APP_USER:-quiz}"
@@ -73,6 +69,16 @@ if [ ! -f "$ENV_FILE" ]; then
echo "Using /root/.quiz.env" echo "Using /root/.quiz.env"
cp /root/.quiz.env "$ENV_FILE" cp /root/.quiz.env "$ENV_FILE"
else else
# Need to prompt for the admin password; reattach TTY if curl|bash
# left stdin pointed at the pipe.
if [ ! -t 0 ] && [ -r /dev/tty ]; then
exec < /dev/tty
fi
if [ ! -t 0 ]; then
echo "ERROR: stdin is not a TTY and /root/.quiz.env is missing." >&2
echo "Either pre-populate /root/.quiz.env or run this script interactively." >&2
exit 1
fi
QUIZ_SECRET_KEY=$(python3 -c 'import secrets; print(secrets.token_urlsafe(48))') QUIZ_SECRET_KEY=$(python3 -c 'import secrets; print(secrets.token_urlsafe(48))')
printf 'Admin password (input hidden): ' printf 'Admin password (input hidden): '
read -rs QUIZ_ADMIN_PASSWORD read -rs QUIZ_ADMIN_PASSWORD