Bob Mottram пре 10 година
родитељ
комит
315587ea3a
1 измењених фајлова са 6 додато и 9 уклоњено
  1. 6
    9
      src/freedombone-config

+ 6
- 9
src/freedombone-config Прегледај датотеку

249
 
249
 
250
   if [ ! -f $REMOTE_SERVERS_LIST ]; then
250
   if [ ! -f $REMOTE_SERVERS_LIST ]; then
251
       dialog --title "Encryption keys" --msgbox 'Error obtaining server list' 6 70
251
       dialog --title "Encryption keys" --msgbox 'Error obtaining server list' 6 70
252
-      echo "1"
253
-      return
252
+      return 1
254
   fi
253
   fi
255
 
254
 
256
   # check the number of entries in the file
255
   # check the number of entries in the file
257
   no_of_servers=$(cat $REMOTE_SERVERS_LIST | wc -l)
256
   no_of_servers=$(cat $REMOTE_SERVERS_LIST | wc -l)
258
   if [[ ${no_of_servers} < 3 ]]; then
257
   if [[ ${no_of_servers} < 3 ]]; then
259
       dialog --title "Encryption keys" --msgbox 'There must be at least three servers to recover the key' 6 70
258
       dialog --title "Encryption keys" --msgbox 'There must be at least three servers to recover the key' 6 70
260
-      echo "2"
261
-      return
259
+      return 2
262
   fi
260
   fi
263
 
261
 
264
   # try to recover the key from the servers
262
   # try to recover the key from the servers
265
   freedombone-recoverkey -u $MY_USERNAME -l $REMOTE_SERVERS_LIST
263
   freedombone-recoverkey -u $MY_USERNAME -l $REMOTE_SERVERS_LIST
266
   if [ ! "$?" = "0" ]; then
264
   if [ ! "$?" = "0" ]; then
267
       dialog --title "Encryption keys" --msgbox 'Your key could not be recovered' 6 70
265
       dialog --title "Encryption keys" --msgbox 'Your key could not be recovered' 6 70
268
-      echo "3"
269
-      return
266
+      return 3
270
   fi
267
   fi
271
 
268
 
272
   dialog --title "Encryption keys" --msgbox 'Your key has been recovered' 6 70
269
   dialog --title "Encryption keys" --msgbox 'Your key has been recovered' 6 70
273
 
270
 
274
-  echo '0'
271
+  return 0
275
 }
272
 }
276
 
273
 
277
 function interactive_gpg_from_usb {
274
 function interactive_gpg_from_usb {
349
           3 "Retrieve keys from friends servers" off 2> $data
346
           3 "Retrieve keys from friends servers" off 2> $data
350
       sel=$?
347
       sel=$?
351
       case $sel in
348
       case $sel in
352
-          1) exit 123;;
353
-          255) exit 234;;
349
+          1) exit 1;;
350
+          255) exit 2;;
354
       esac
351
       esac
355
       case $(cat $data) in
352
       case $(cat $data) in
356
           1) return;;
353
           1) return;;