浏览代码

More fixing of interactive install

Bob Mottram 10 年前
父节点
当前提交
4d9298f483
共有 1 个文件被更改,包括 17 次插入12 次删除
  1. 17
    12
      src/freedombone

+ 17
- 12
src/freedombone 查看文件

@@ -94,6 +94,7 @@ VERSION="1.00"
94 94
 
95 95
 # Different system variants which may be specified within
96 96
 # the SYSTEM_TYPE option
97
+VARIANT_FULL="full"
97 98
 VARIANT_WRITER="writer"
98 99
 VARIANT_CLOUD="cloud"
99 100
 VARIANT_CHAT="chat"
@@ -378,8 +379,8 @@ function show_help {
378 379
 }
379 380
 
380 381
 function interactive_configuration_remote_backups {
381
-	# TODO
382
-	exit 0
382
+    # TODO
383
+    exit 0
383 384
 }
384 385
 
385 386
 function interactive_configuration {
@@ -402,6 +403,7 @@ function interactive_configuration {
402 403
       255) exit 0;;
403 404
   esac
404 405
   case $(cat $data) in
406
+      1) SYSTEM_TYPE=$VARIANT_FULL;;
405 407
       2) SYSTEM_TYPE=$VARIANT_WRITER;;
406 408
       3) SYSTEM_TYPE=$VARIANT_CLOUD;;
407 409
       4) SYSTEM_TYPE=$VARIANT_CHAT;;
@@ -416,7 +418,7 @@ function interactive_configuration {
416 418
   trap "rm -f $data" 0 1 2 5 15
417 419
   dialog --title "Select the user account to install as" \
418 420
       --backtitle "Freedombone Configuration" \
419
-	  --dselect /home/ 14 40 2> $data
421
+      --dselect /home/ 14 40 2> $data
420 422
   sel=$?
421 423
   case $sel in
422 424
       0) MY_USERNAME=$(cat $data | awk -F '/' '{print $3}');;
@@ -424,8 +426,12 @@ function interactive_configuration {
424 426
       255) exit 0;;
425 427
   esac
426 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 435
   fi
430 436
 
431 437
   dialog --title "Install Target" \
@@ -559,7 +565,7 @@ function interactive_configuration {
559 565
       255) exit 0;;
560 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 569
       dialog --backtitle "Freedombone Configuration" \
564 570
           --inputbox "Wiki Title" 10 30 2> $data
565 571
       sel=$?
@@ -605,7 +611,7 @@ function interactive_configuration {
605 611
       fi
606 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 615
       dialog --backtitle "Freedombone Configuration" \
610 616
           --inputbox "Blog Title" 10 30 2> $data
611 617
       sel=$?
@@ -644,8 +650,7 @@ function interactive_configuration {
644 650
       fi
645 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 654
       dialog --backtitle "Freedombone Configuration" \
650 655
           --inputbox "Owncloud domain name" 10 30 2> $data
651 656
       sel=$?
@@ -678,7 +683,7 @@ function interactive_configuration {
678 683
       fi
679 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 687
       dialog --backtitle "Freedombone Configuration" \
683 688
           --inputbox "RedMatrix domain name" 10 30 2> $data
684 689
       sel=$?
@@ -711,7 +716,7 @@ function interactive_configuration {
711 716
       fi
712 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 720
       dialog --backtitle "Freedombone Configuration" \
716 721
           --inputbox "Microblog domain name" 10 30 2> $data
717 722
       sel=$?
@@ -767,7 +772,7 @@ function interactive_configuration {
767 772
   fi
768 773
 
769 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 776
   sel=$?
772 777
   case $sel in
773 778
       0) MY_EMAIL_ADDRESS=$(cat $data);;