From 0f4039d608461ad4b757cc3406e6f30709d36f22 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Fri, 3 Jul 2015 23:35:57 +0100
Subject: [PATCH] Ensure that only fragments are listed
---
src/freedombone | 2 +-
src/freedombone-recoverkey | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/freedombone b/src/freedombone
index a668cd3ce..6a1d39648 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -3818,7 +3818,7 @@ function backup_to_friends_servers {
echo " if [ -d /home/$MY_USERNAME/.gnupg_fragments ]; then" >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
echo ' if [ $REMOTE_DOMAIN ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
echo " cd /home/$MY_USERNAME/.gnupg_fragments" >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
- echo ' no_of_shares=$(ls -afq keyshare* | wc -l)' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
+ echo ' no_of_shares=$(ls -afq keyshare.asc.* | wc -l)' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
echo ' no_of_shares=$((no_of_shares - 2))' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
echo ' if [[ ${no_of_shares} > 0 ]]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
echo ' # Pick a share index based on the domain name' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
diff --git a/src/freedombone-recoverkey b/src/freedombone-recoverkey
index 6d936a9ce..308375ce1 100755
--- a/src/freedombone-recoverkey
+++ b/src/freedombone-recoverkey
@@ -127,7 +127,7 @@ fi
# was anything downloaded?
cd $FRAGMENTS_DIR
-no_of_shares=$(ls -afq keyshare* | wc -l)
+no_of_shares=$(ls -afq keyshare.asc.* | wc -l)
no_of_shares=$((no_of_shares - 2))
if [[ ${no_of_shares} == 0 ]]; then
echo 'No key fragments were retrieved'
--
GitLab