Browse Source

Fix system type

Bob Mottram 10 years ago
parent
commit
73dba7860a
1 changed files with 42 additions and 16 deletions
  1. 42
    16
      src/freedombone

+ 42
- 16
src/freedombone View File

377
   exit 0
377
   exit 0
378
 }
378
 }
379
 
379
 
380
+function interactive_configuration_remote_backups {
381
+	# TODO
382
+	exit 0
383
+}
384
+
380
 function interactive_configuration {
385
 function interactive_configuration {
386
+  data=$(tempfile 2>/dev/null)
387
+  trap "rm -f $data" 0 1 2 5 15
381
   dialog --backtitle "Freedombone Configuration" \
388
   dialog --backtitle "Freedombone Configuration" \
382
-      --radiolist "Type of Installation:" 15 40 10 \
389
+      --radiolist "Type of Installation:" 15 40 9 \
383
       1 Full on \
390
       1 Full on \
384
       2 Writer off \
391
       2 Writer off \
385
       3 Cloud off \
392
       3 Cloud off \
388
       6 Non-Mailbox off \
395
       6 Non-Mailbox off \
389
       7 Social off \
396
       7 Social off \
390
       8 Media off \
397
       8 Media off \
391
-      9 Tor-Dongle off
398
+      9 Tor-Dongle off 2> $data
392
   sel=$?
399
   sel=$?
393
   case $sel in
400
   case $sel in
394
-      1) ;;
401
+      1) exit 0;;
402
+      255) exit 0;;
403
+  esac
404
+  case $(cat $data) in
395
       2) SYSTEM_TYPE=$VARIANT_WRITER;;
405
       2) SYSTEM_TYPE=$VARIANT_WRITER;;
396
       3) SYSTEM_TYPE=$VARIANT_CLOUD;;
406
       3) SYSTEM_TYPE=$VARIANT_CLOUD;;
397
       4) SYSTEM_TYPE=$VARIANT_CHAT;;
407
       4) SYSTEM_TYPE=$VARIANT_CHAT;;
400
       7) SYSTEM_TYPE=$VARIANT_SOCIAL;;
410
       7) SYSTEM_TYPE=$VARIANT_SOCIAL;;
401
       8) SYSTEM_TYPE=$VARIANT_MEDIA;;
411
       8) SYSTEM_TYPE=$VARIANT_MEDIA;;
402
       9) SYSTEM_TYPE=$VARIANT_TOR_DONGLE;;
412
       9) SYSTEM_TYPE=$VARIANT_TOR_DONGLE;;
413
+  esac
414
+
415
+  data=$(tempfile 2>/dev/null)
416
+  trap "rm -f $data" 0 1 2 5 15
417
+  dialog --title "Select the user account to install as" \
418
+      --backtitle "Freedombone Configuration" \
419
+	  --dselect /home/ 14 40 2> $data
420
+  sel=$?
421
+  case $sel in
422
+      0) MY_USERNAME=$(cat $data | awk -F '/' '{print $3}');;
423
+      1) exit 0;;
403
       255) exit 0;;
424
       255) exit 0;;
404
   esac
425
   esac
426
+  if [ ! $MY_USERNAME ]; then
427
+	  echo 'No user account was selected'
428
+	  exit 0
429
+  fi
405
 
430
 
406
   dialog --title "Install Target" \
431
   dialog --title "Install Target" \
407
       --backtitle "Freedombone Configuration" \
432
       --backtitle "Freedombone Configuration" \
494
   fi
519
   fi
495
 
520
 
496
   dialog --backtitle "Freedombone Configuration" \
521
   dialog --backtitle "Freedombone Configuration" \
497
-      --inputbox "Your email address" 10 30 2> $data
498
-  sel=$?
499
-  case $sel in
500
-      0) MY_EMAIL_ADDRESS=$(cat $data);;
501
-      1) exit 0;;
502
-      255) exit 0;;
503
-  esac
504
-  if [ ! $MY_EMAIL_ADDRESS ]; then
505
-      exit 8357
506
-  fi
507
-
508
-  dialog --backtitle "Freedombone Configuration" \
509
       --inputbox "Static IP Address of this system" 10 30 2> $data
522
       --inputbox "Static IP Address of this system" 10 30 2> $data
510
   sel=$?
523
   sel=$?
511
   case $sel in
524
   case $sel in
746
           fi
759
           fi
747
       fi
760
       fi
748
   fi
761
   fi
749
-  clear
762
+
763
+  dialog --backtitle "Freedombone Configuration" \
764
+      --inputbox "Your email address" 10 30 $MY_USERNAME@$DOMAIN_NAME> $data
765
+  sel=$?
766
+  case $sel in
767
+      0) MY_EMAIL_ADDRESS=$(cat $data);;
768
+      1) exit 0;;
769
+      255) exit 0;;
770
+  esac
771
+  if [ ! $MY_EMAIL_ADDRESS ]; then
772
+      exit 8357
773
+  fi
774
+
775
+  #clear
750
   exit 0
776
   exit 0
751
 }
777
 }
752
 
778