Skip to content

Edit fixes #1662

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
troglobit merged 2 commits into from
Sep 26, 2026
+5 −6
Merged

Edit fixes #1662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
721a7d3
askline: use bash, BusyBox ash has no read -e or -i
troglobit Sep 26, 2026
fa99387
askpass: abort on Ctrl-D, report errors on stderr
troglobit Sep 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions board/common/rootfs/usr/bin/askline
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
#!/bin/sh
#!/bin/bash
# Prompt for a single-line value, prefilled with the current one.
#
# askline LABEL FILE
#
# FILE holds the current value on entry and the new value on exit.
# shellcheck disable=SC3045

LABEL=$1
FILE=$2
Expand Down
8 changes: 4 additions & 4 deletions board/common/rootfs/usr/bin/askpass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@ if [ "$1" = "-b" ]; then
fi
OUTPUT=$1

read -r -s -p "$LABEL: " secret
read -r -s -p "$LABEL: " secret || exit 1
>&2 echo
read -r -s -p "Retype $LABEL: " secret_again
read -r -s -p "Retype $LABEL: " secret_again || exit 1
>&2 echo

if [ "$secret" != "$secret_again" ]; then
echo "${LABEL}s do not match, try again."
>&2 echo "${LABEL}s do not match, try again."
exit 1
fi

if [ -z "$secret" ]; then
echo "Empty $LABEL, try again."
>&2 echo "Empty $LABEL, try again."
exit 1
fi

Expand Down