From db073c85d610394e70e67bc063a4a7d253f51389 Mon Sep 17 00:00:00 2001
From: "C. McEnroe" <june@causal.agency>
Date: Thu, 29 Oct 2020 12:02:09 -0400
Subject: Clean up variable expansions in shell script

---
 git-fetch-email.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/git-fetch-email.sh b/git-fetch-email.sh
index 3272a2b..52aa74f 100644
--- a/git-fetch-email.sh
+++ b/git-fetch-email.sh
@@ -16,6 +16,8 @@
 
 set -u
 
+apply=
+verbose=
 host=$(git config fetchemail.imapServer)
 port=$(git config fetchemail.imapServerPort)
 user=$(git config fetchemail.imapUser)
@@ -50,12 +52,12 @@ while [ $# -gt 0 ]; do
 		(-F) from=$1; shift;;
 		(-S) subject=$1; shift;;
 		(-T) to=$1; shift;;
-		(-a) apply=1;;
+		(-a) apply=yes;;
 		(-h) host=$1; shift;;
 		(-m) mailbox=$1; shift;;
 		(-p) port=$1; shift;;
 		(-u) user=$1; shift;;
-		(-v) verbose=1;;
+		(-v) verbose=yes;;
 		(--no-apply) apply=;;
 		(--no-cc) cc=;;
 		(--no-from) from=;;
@@ -65,7 +67,7 @@ while [ $# -gt 0 ]; do
 		(--) break;;
 	esac
 done
-if [ -z "${user:-}" ]; then
+if [ -z "${user}" ]; then
 	echo "${0}: username required" >&2
 	exit 1
 fi
@@ -79,7 +81,7 @@ description() {
 	EOF
 }
 
-if [ -z "${pass:-}" ]; then
+if [ -z "${pass}" ]; then
 	pass=$(description | git credential fill | grep '^password=')
 	pass=${pass#*=}
 fi
@@ -104,7 +106,7 @@ fetch() {
 	return $status
 }
 
-if [ -n "${apply:-}" ]; then
+if [ -n "${apply}" ]; then
 	fetch | git am --patch-format=mboxrd "$@"
 else
 	fetch
-- 
cgit 1.4.1