summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Smith <luke@lukesmith.xyz>2019-04-21 13:44:20 -0400
committerLuke Smith <luke@lukesmith.xyz>2019-04-21 13:44:20 -0400
commit29d6ad1c0145f9e818434baf0cce03ce6b455672 (patch)
treeb693efa4497bbf9fd3160bbdec617e6bcf771ac3
parentc952028d883952f573d3283dd269a7c4dd993ff5 (diff)
yes and no clarity
-rwxr-xr-xmw10
1 files changed, 5 insertions, 5 deletions
diff --git a/mw b/mw
index 5377a26..3861ca0 100755
--- a/mw
+++ b/mw
@@ -220,8 +220,8 @@ finalize() { \
[ "$accounttype" = "offline" ] && printf "All done.\\n\033[33mYou should now be able to run \`\033[32mmbsync %s\033[33m\` to begin to download your mail.\033[0m\\n" "$title"
}
-confirm() { printf "Are you \033[31;1mreally\033[0m sure you want to %s?\\n\t" "$@" && read -r input && ! echo "$input" | grep -i "y\(es\)*" >/dev/null && printf "That doesn't seem like a yes to me.\\n\\n" && return 1
- printf "Are you really, really sure you want to %s?\\n\t" "$@" && read -r input && ! echo "$input" | grep -i "y\(es\)*" >/dev/null && printf "That doesn't seem like a yes to me.\\n\\n" && return 1
+confirm() { printf "Do you want to to %s?\\n\t" "$@" && read -r input && ! echo "$input" | grep -i "^y$\|^yes$ ">/dev/null && printf "That doesn't seem like a yes to me.\\n\\n" && return 1
+ printf "Are you really, really sure you want to %s?\\n\t" "$@" && read -r input && ! echo "$input" | grep -i "^y$\|^yes$" >/dev/null && printf "That doesn't seem like a yes to me.\\n\\n" && return 1
return 0 ;}
pick() { numbered="$(find "$accdir" -mindepth 1 -maxdepth 1 -type d -printf "%f\n" | nl)"
@@ -268,9 +268,9 @@ addtype() { ! command -v mbsync >/dev/null && printf "You must have the \`mbsync
printf "Do you want to keep your mail for this account offline with mbsync? [yes/no]\\n\t"
read -r offnot
case "$offnot" in
- [Yy]es) accounttype="offline" && break ;;
- [Nn]o) accounttype="online" && break ;;
- *) echo "I don't know what you mean. Try again or press ctrl-c to quit." ;;
+ [Yy][Ee][Ss]) accounttype="offline" && break ;;
+ [Nn][Oo]) accounttype="online" && break ;;
+ *) echo "Write out either yes or no completely. Try again or press ctrl-c to quit." ;;
esac
done
addaccount ;}