free
/
freedombone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cd to directory before search

This commit is contained in:
Bob Mottram 2015-07-04 17:20:44 +01:00
parent 3430bd27ae
commit 09e555d312
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/freedombone-keydrive
View File

@ -140,7 +140,8 @@ if [ ! -d $FRAGMENTS_DIR ]; then
exit 6843 exit 6843
fi fi
no_of_usb_shares=$(ls -afq $FRAGMENTS_DIR/keyshare.asc.* | wc -l) cd $FRAGMENTS_DIR
no_of_usb_shares=$(ls -afq keyshare.asc.* | wc -l)
if [ ! "$?" = "0" ]; then if [ ! "$?" = "0" ]; then
no_of_usb_shares=0 no_of_usb_shares=0
else else
@ -160,7 +161,8 @@ if [ ! -d $LOCAL_FRAGMENTS_DIR ]; then
freedombone-splitkey -u $MY_USERNAME freedombone-splitkey -u $MY_USERNAME
fi fi
no_of_local_shares=$(ls -afq $LOCAL_FRAGMENTS_DIR/keyshare.asc.* | wc -l) cd $LOCAL_FRAGMENTS_DIR
no_of_local_shares=$(ls -afq keyshare.asc.* | wc -l)
if [ ! "$?" = "0" ]; then if [ ! "$?" = "0" ]; then
no_of_local_shares=0 no_of_local_shares=0
else else
@ -168,7 +170,8 @@ else
fi fi
if (( no_of_local_shares < 3 )); then if (( no_of_local_shares < 3 )); then
freedombone-splitkey -u $MY_USERNAME freedombone-splitkey -u $MY_USERNAME
no_of_local_shares=$(ls -afq $LOCAL_FRAGMENTS_DIR/keyshare.asc.* | wc -l) cd $LOCAL_FRAGMENTS_DIR
no_of_local_shares=$(ls -afq keyshare.asc.* | wc -l)
if [ ! "$?" = "0" ]; then if [ ! "$?" = "0" ]; then
no_of_local_shares=0 no_of_local_shares=0
else else
@ -187,9 +190,17 @@ share_files=($LOCAL_FRAGMENTS_DIR/keyshare.asc.*)
SHARE_FILENAME=${share_files[RANDOM % ${#share_files[@]}]} SHARE_FILENAME=${share_files[RANDOM % ${#share_files[@]}]}
cp -f $SHARE_FILENAME $FRAGMENTS_DIR cp -f $SHARE_FILENAME $FRAGMENTS_DIR
no_of_usb_shares=$(ls -afq $FRAGMENTS_DIR/keyshare.asc.* | wc -l) cd $FRAGMENTS_DIR
no_of_usb_shares=$(ls -afq keyshare.asc.* | wc -l)
no_of_usb_shares=$((no_of_usb_shares - 2)) no_of_usb_shares=$((no_of_usb_shares - 2))
if (( no_of_usb_shares != 1 )); then if (( no_of_usb_shares > 1 )); then
echo "Too many key fragments exist in $FRAGMENTS_DIR"
ls $FRAGMENTS_DIR
umount $USB_MOUNT
rm -rf $USB_MOUNT
exit 54292
fi
if (( no_of_usb_shares <= 0 )); then
echo "There was a problem copying the key fragment to $USB_DRIVE" echo "There was a problem copying the key fragment to $USB_DRIVE"
ls $FRAGMENTS_DIR ls $FRAGMENTS_DIR
umount $USB_MOUNT umount $USB_MOUNT