X-Git-Url: https://git.distorted.org.uk/~mdw/distorted-keys/blobdiff_plain/7b1fe7a30da02085479a6d5c3b3f8f0fc7fddf65..718781737ae6926a7934dfc1007010915d9e484a:/keys.delete-keeper diff --git a/keys.delete-keeper b/keys.delete-keeper index edcb718..84a3ae9 100755 --- a/keys.delete-keeper +++ b/keys.delete-keeper @@ -54,9 +54,9 @@ if [ -d $KEYS/recov ]; then cd $KEYS/recov ## Work through the available recovery keys. - for r in $(find . -type l -name current -print); do - r=${r#./}; r=${r%/current} - if ! expr >/dev/null "Q$r" : "Q$R_LABEL"; then continue; fi + for r in *; do + if ! expr >/dev/null "Q$r" : "Q$R_WORD"; then continue; fi + if [ ! -l $r/current ]; then continue; fi ## Add the key to our list. recov="$recov$r " @@ -64,7 +64,7 @@ if [ -d $KEYS/recov ]; then ## Now work through the instances. ii="" for ri in $r/*; do - i=${ri##*/} + i=${ri#*/} case "$i" in *[!0-9]*) continue ;; esac ## Add the instance to our list.