Browse Source

No need to read usb drive

Bob Mottram 7 years ago
parent
commit
d321d9f18f
2 changed files with 3 additions and 18 deletions
  1. 2
    17
      src/freedombone-recoverkey
  2. 1
    1
      src/freedombone-utils-keys

+ 2
- 17
src/freedombone-recoverkey View File

@@ -42,20 +42,13 @@ do
42 42
     source $f
43 43
 done
44 44
 
45
-read_config_param USB_DRIVE
46
-
47 45
 FRIENDS_SERVERS_LIST=
48 46
 MY_USERNAME=
49
-if [ $USB_DRIVE ]; then
50
-    GPG_USB_DRIVE=$USB_DRIVE
51
-else
52
-    GPG_USB_DRIVE='/dev/sdb1'
53
-fi
54 47
 
55 48
 function show_help {
56 49
     echo ''
57
-    echo $"${PROJECT_NAME}-recoverkey -u [username] -d [drive]"
58
-    echo $'                       -l [friends servers list filename]'
50
+    echo $"${PROJECT_NAME}-recoverkey -u [username]"
51
+    echo $'                           -l [friends servers list filename]'
59 52
     echo ''
60 53
     exit 0
61 54
 }
@@ -78,14 +71,6 @@ do
78 71
             shift
79 72
             FRIENDS_SERVERS_LIST="$1"
80 73
             ;;
81
-        -d|--drive)
82
-            shift
83
-            if [[ "${1}" != '/dev/'* ]]; then
84
-                GPG_USB_DRIVE=/dev/${1}1
85
-            else
86
-                GPG_USB_DRIVE=${1}
87
-            fi
88
-            ;;
89 74
         *)
90 75
             # unknown option
91 76
             ;;

+ 1
- 1
src/freedombone-utils-keys View File

@@ -50,7 +50,7 @@ function reconstruct_key {
50 50
         dialog --title $"Recover Encryption Keys" --msgbox $'Unable to reconstruct the key' 6 70
51 51
     fi
52 52
 
53
-    su -c "gpg --allow-secret-key-import --import $KEYS_FILE" - $MY_USERNAME
53
+    gpg --homedir=/home/$MY_USERNAME/.gnupg --allow-secret-key-import --import $KEYS_FILE
54 54
     if [ ! "$?" = "0" ]; then
55 55
         echo $'Unable to import gpg key'
56 56
         shred -zu $KEYS_FILE