X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhsign.sh;h=9a060532e2ef4c23d48ab044b67625858090edb1;hb=f36530fd658fd2ccfac328c5097f7b44712eceac;hp=ac56bc26ca103998b7d42600e4772d5a28b733ae;hpb=f45cdc98117a84f071759462c7ae212f4bc5ab2e;p=mmh

diff --git a/uip/mhsign.sh b/uip/mhsign.sh
index ac56bc2..9a06053 100755
--- a/uip/mhsign.sh
+++ b/uip/mhsign.sh
@@ -18,12 +18,14 @@ function=sign
 
 # find out the signing key
 userid="$MMHPGPKEY"
-if [ "x$userid" = "x" ] ; then
+if [ -z "$userid" ] ; then
 	userid="`mhparam pgpkey`"
 fi
-userid="`gpg --list-secret-keys --with-colons 2>/dev/null |
-		sed -n '/^sec/{p;q}' | cut -d: -f5`"
-if [ "x$userid" = x ] ; then
+if [ -z "$userid" ] ; then
+	userid="`gpg --list-secret-keys --with-colons 2>/dev/null |
+			sed -n '/^sec/{p;q;}' | cut -d: -f5`"
+fi
+if [ -z "$userid" ] ; then
 	echo "No secret key found" >&2
 	exit 1
 fi
@@ -89,7 +91,7 @@ lookupkeyring() {
 	if [ $? != 0 ] ; then
 		return 1
 	fi
-	echo "$key" | sed -n '/^pub/{p;q}' | cut -d: -f5
+	echo "$key" | sed -n '/^pub/{p;q;}' | cut -d: -f5
 	return 0
 }