浏览代码

Return values

Bob Mottram 10 年前
父节点
当前提交
315587ea3a
共有 1 个文件被更改,包括 6 次插入9 次删除
  1. 6
    9
      src/freedombone-config

+ 6
- 9
src/freedombone-config 查看文件

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