X-Git-Url: https://git.distorted.org.uk/~mdw/distorted-keys/blobdiff_plain/d516ebd0d3928deae4cf80a113d6ccf1f666bfe6..0bc47568f2c94d6e48bc389ac508d5f905daa9c7:/keys.new-keeper diff --git a/keys.new-keeper b/keys.new-keeper index 2ccd7ee..78e792d 100755 --- 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