Browse Source

More fixing of interactive install

Bob Mottram 10 years ago
parent
commit
4d9298f483
1 changed files with 17 additions and 12 deletions
  1. 17
    12
      src/freedombone

+ 17
- 12
src/freedombone View File

94
 
94
 
95
 # Different system variants which may be specified within
95
 # Different system variants which may be specified within
96
 # the SYSTEM_TYPE option
96
 # the SYSTEM_TYPE option
97
+VARIANT_FULL="full"
97
 VARIANT_WRITER="writer"
98
 VARIANT_WRITER="writer"
98
 VARIANT_CLOUD="cloud"
99
 VARIANT_CLOUD="cloud"
99
 VARIANT_CHAT="chat"
100
 VARIANT_CHAT="chat"
378
 }
379
 }
379
 
380
 
380
 function interactive_configuration_remote_backups {
381
 function interactive_configuration_remote_backups {
381
-	# TODO
382
-	exit 0
382
+    # TODO
383
+    exit 0
383
 }
384
 }
384
 
385
 
385
 function interactive_configuration {
386
 function interactive_configuration {
402
       255) exit 0;;
403
       255) exit 0;;
403
   esac
404
   esac
404
   case $(cat $data) in
405
   case $(cat $data) in
406
+      1) SYSTEM_TYPE=$VARIANT_FULL;;
405
       2) SYSTEM_TYPE=$VARIANT_WRITER;;
407
       2) SYSTEM_TYPE=$VARIANT_WRITER;;
406
       3) SYSTEM_TYPE=$VARIANT_CLOUD;;
408
       3) SYSTEM_TYPE=$VARIANT_CLOUD;;
407
       4) SYSTEM_TYPE=$VARIANT_CHAT;;
409
       4) SYSTEM_TYPE=$VARIANT_CHAT;;
416
   trap "rm -f $data" 0 1 2 5 15
418
   trap "rm -f $data" 0 1 2 5 15
417
   dialog --title "Select the user account to install as" \
419
   dialog --title "Select the user account to install as" \
418
       --backtitle "Freedombone Configuration" \
420
       --backtitle "Freedombone Configuration" \
419
-	  --dselect /home/ 14 40 2> $data
421
+      --dselect /home/ 14 40 2> $data
420
   sel=$?
422
   sel=$?
421
   case $sel in
423
   case $sel in
422
       0) MY_USERNAME=$(cat $data | awk -F '/' '{print $3}');;
424
       0) MY_USERNAME=$(cat $data | awk -F '/' '{print $3}');;
424
       255) exit 0;;
426
       255) exit 0;;
425
   esac
427
   esac
426
   if [ ! $MY_USERNAME ]; then
428
   if [ ! $MY_USERNAME ]; then
427
-	  echo 'No user account was selected'
428
-	  exit 0
429
+      echo 'No user account was selected'
430
+      exit 0
431
+  fi
432
+  if [ ! -d /home/$MY_USERNAME ]; then
433
+      echo "The directory /home/$MY_USERNAME does not exist"
434
+      exit 6437
429
   fi
435
   fi
430
 
436
 
431
   dialog --title "Install Target" \
437
   dialog --title "Install Target" \
559
       255) exit 0;;
565
       255) exit 0;;
560
   esac
566
   esac
561
 
567
 
562
-  if [[ $SYSTEM_TYPE==$VARIANT_WRITER || ! $SYSTEM_TYPE ]]; then
568
+  if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_FULL" ]]; then
563
       dialog --backtitle "Freedombone Configuration" \
569
       dialog --backtitle "Freedombone Configuration" \
564
           --inputbox "Wiki Title" 10 30 2> $data
570
           --inputbox "Wiki Title" 10 30 2> $data
565
       sel=$?
571
       sel=$?
605
       fi
611
       fi
606
   fi
612
   fi
607
 
613
 
608
-  if [[ $SYSTEM_TYPE==$VARIANT_WRITER || ! $SYSTEM_TYPE ]]; then
614
+  if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_FULL" ]]; then
609
       dialog --backtitle "Freedombone Configuration" \
615
       dialog --backtitle "Freedombone Configuration" \
610
           --inputbox "Blog Title" 10 30 2> $data
616
           --inputbox "Blog Title" 10 30 2> $data
611
       sel=$?
617
       sel=$?
644
       fi
650
       fi
645
   fi
651
   fi
646
 
652
 
647
-
648
-  if [[ $SYSTEM_TYPE==$VARIANT_CLOUD || ! $SYSTEM_TYPE ]]; then
653
+  if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_FULL" ]]; then
649
       dialog --backtitle "Freedombone Configuration" \
654
       dialog --backtitle "Freedombone Configuration" \
650
           --inputbox "Owncloud domain name" 10 30 2> $data
655
           --inputbox "Owncloud domain name" 10 30 2> $data
651
       sel=$?
656
       sel=$?
678
       fi
683
       fi
679
   fi
684
   fi
680
 
685
 
681
-  if [[ $SYSTEM_TYPE==$VARIANT_SOCIAL || ! $SYSTEM_TYPE ]]; then
686
+  if [[ $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_FULL" ]]; then
682
       dialog --backtitle "Freedombone Configuration" \
687
       dialog --backtitle "Freedombone Configuration" \
683
           --inputbox "RedMatrix domain name" 10 30 2> $data
688
           --inputbox "RedMatrix domain name" 10 30 2> $data
684
       sel=$?
689
       sel=$?
711
       fi
716
       fi
712
   fi
717
   fi
713
 
718
 
714
-  if [[ $SYSTEM_TYPE==$VARIANT_SOCIAL || ! $SYSTEM_TYPE ]]; then
719
+  if [[ $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_FULL" ]]; then
715
       dialog --backtitle "Freedombone Configuration" \
720
       dialog --backtitle "Freedombone Configuration" \
716
           --inputbox "Microblog domain name" 10 30 2> $data
721
           --inputbox "Microblog domain name" 10 30 2> $data
717
       sel=$?
722
       sel=$?
767
   fi
772
   fi
768
 
773
 
769
   dialog --backtitle "Freedombone Configuration" \
774
   dialog --backtitle "Freedombone Configuration" \
770
-      --inputbox "Your email address" 10 30 $MY_USERNAME@$DOMAIN_NAME> $data
775
+      --inputbox "Your email address" 10 30 "$MY_USERNAME@$DOMAIN_NAME" 2> $data
771
   sel=$?
776
   sel=$?
772
   case $sel in
777
   case $sel in
773
       0) MY_EMAIL_ADDRESS=$(cat $data);;
778
       0) MY_EMAIL_ADDRESS=$(cat $data);;