profile.d/01gnupg: Remove spurious initial `%' from `email' address.

[distorted-keys] / keys.new-keeper

diff --git a/keys.new-keeper b/keys.new-keeper
index 2ccd7ee74ae4c61267cf81bacd6eaded11676f0e..78e792d81e8daf06c8782014c17710a57d778fde 100755 (executable)
--- a/keys.new-keeper
+++ b/keys.new-keeper
@@ -38,9 +38,8 @@ HELP
 ## Parse the command line.
 force=nil
 profile=${keeper_profile-keeper}
-while getopts "fp:" opt; do
+while getopts "p:" opt; do
   case "$opt" in
-    f) force=t ;;
     p) profile=$OPTARG ;;
     *) usage_err ;;
   esac
@@ -54,26 +53,18 @@ checkword "profile label" "$profile"
 
 ## Preflight checking.
 reqsafe
-case $force in
-  nil)
-    if [ -e $KEYS/keeper/$keeper ]; then
-      echo >&2 "$0: keeper set \`$keeper' already exists"
-      exit 1
-    fi
-    if [ -e $SAFE/keys.keeper/$keeper ]; then
-      echo >&2 "$0: destination \`$keeper' already exists"
-      exit 1
-    fi
-    ;;
-  t)
-    rm -rf $KEYS/keeper/$keeper
-    rm -rf $SAFE/keys.keeper/$keeper/
-    ;;
-esac
+if [ -e $KEYS/keeper/$keeper ]; then
+  echo >&2 "$quis: keeper set \`$keeper' already exists"
+  exit 1
+fi
+if [ -e $SAFE/keys.keeper/$keeper ]; then
+  echo >&2 "$quis: destination \`$keeper' already exists"
+  exit 1
+fi
 
 ## Generate the private keys, one per file, and compute the public keys.
 mktmp
-mkdir -m700 $SAFE/keys.keeper/
+mkdir -m700 -p $SAFE/keys.keeper/
 cd $SAFE/keys.keeper/
 rm -rf $keeper.new
 mkdir -m700 $keeper.new