Browse Source

Ensure that only fragments are listed

Bob Mottram 10 years ago
parent
commit
0f4039d608
2 changed files with 2 additions and 2 deletions
  1. 1
    1
      src/freedombone
  2. 1
    1
      src/freedombone-recoverkey

+ 1
- 1
src/freedombone View File

3818
       echo "    if [ -d /home/$MY_USERNAME/.gnupg_fragments ]; then" >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3818
       echo "    if [ -d /home/$MY_USERNAME/.gnupg_fragments ]; then" >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3819
       echo '        if [ $REMOTE_DOMAIN ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3819
       echo '        if [ $REMOTE_DOMAIN ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3820
       echo "            cd /home/$MY_USERNAME/.gnupg_fragments" >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3820
       echo "            cd /home/$MY_USERNAME/.gnupg_fragments" >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3821
-      echo '            no_of_shares=$(ls -afq keyshare* | wc -l)' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3821
+      echo '            no_of_shares=$(ls -afq keyshare.asc.* | wc -l)' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3822
       echo '            no_of_shares=$((no_of_shares - 2))' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3822
       echo '            no_of_shares=$((no_of_shares - 2))' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3823
       echo '            if [[ ${no_of_shares} > 0 ]]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3823
       echo '            if [[ ${no_of_shares} > 0 ]]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3824
       echo '                # Pick a share index based on the domain name' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3824
       echo '                # Pick a share index based on the domain name' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME

+ 1
- 1
src/freedombone-recoverkey View File

127
 
127
 
128
 # was anything downloaded?
128
 # was anything downloaded?
129
 cd $FRAGMENTS_DIR
129
 cd $FRAGMENTS_DIR
130
-no_of_shares=$(ls -afq keyshare* | wc -l)
130
+no_of_shares=$(ls -afq keyshare.asc.* | wc -l)
131
 no_of_shares=$((no_of_shares - 2))
131
 no_of_shares=$((no_of_shares - 2))
132
 if [[ ${no_of_shares} == 0 ]]; then
132
 if [[ ${no_of_shares} == 0 ]]; then
133
     echo 'No key fragments were retrieved'
133
     echo 'No key fragments were retrieved'