summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIsmael Luceno2021-01-05 22:50:03 +0100
committerIsmael Luceno2021-10-01 15:28:48 +0200
commit075f27e0684b97f61ad969f6eedb9d43e3bec87a (patch)
tree1765d2f0310ab6d7e9a75e9e31e26e348b84ce55
parent400825245c7fdebbeb10183007d6e25411554d33 (diff)
quill: Avoid signal-handler in URL input loopsHEADmaster
BASH changed the context of signal handlers, and now they can't break out of loops in the triggering context. It's use has always been a hack, so signal the user wish to ignore the checks via an empty input string instead.
-rwxr-xr-xusr/bin/quill10
1 files changed, 7 insertions, 3 deletions
diff --git a/usr/bin/quill b/usr/bin/quill
index 7380ba3..a12624e 100755
--- a/usr/bin/quill
+++ b/usr/bin/quill
@@ -356,14 +356,18 @@ else # no updates, we'll be making a spell
done
query_spell_source_url
# the semirandom fallback url is there to circumvent sorcery bug #13729
- trap break INT
while ! url_verify "${SPELL_SRC_URL:-ftp://34tqgsad}" > /dev/null; do
error_msg "Invalid URL!\n"
- message "If you're sure it is ok or want to skip this check, just hit ^C (ctrl-c)."
+ message "Leave blank if you're sure it is ok or want to skip this check."
+ old="$SPELL_SRC_URL"
unset SPELL_SRC_URL
query_spell_source_url
+ if [ -z "$SPELL_SRC_URL" ]; then
+ SPELL_SRC_URL="$old"
+ break
+ fi
done
- trap INT
+ unset old
query_spell_license
query_spell_url