Explorar el Código

Avoid duplicate domain names

Bob Mottram hace 10 años
padre
commit
f2248f9503
Se han modificado 1 ficheros con 80 adiciones y 84 borrados
  1. 80
    84
      src/freedombone

+ 80
- 84
src/freedombone Ver fichero

@@ -583,51 +583,49 @@ function interactive_configuration {
583 583
       255) exit 0;;
584 584
   esac
585 585
 
586
-  data=$(tempfile 2>/dev/null)
587
-  trap "rm -f $data" 0 1 2 5 15
588
-  dialog --backtitle "Freedombone Configuration" \
589
-      --inputbox "Dynamic DNS provider username" 10 30 2> $data
590
-  sel=$?
591
-  case $sel in
592
-      0) DDNS_USERNAME=$(cat $data);;
593
-      1) exit 0;;
594
-      255) exit 0;;
595
-  esac
596
-  if [ ! $DDNS_USERNAME ]; then
597
-      exit 5245
598
-  fi
586
+  while [ ! $DDNS_USERNAME ]
587
+  do
588
+      data=$(tempfile 2>/dev/null)
589
+      trap "rm -f $data" 0 1 2 5 15
590
+      dialog --backtitle "Freedombone Configuration" \
591
+          --inputbox "Dynamic DNS provider username" 10 30 2> $data
592
+      sel=$?
593
+      case $sel in
594
+          0) DDNS_USERNAME=$(cat $data);;
595
+          1) exit 0;;
596
+          255) exit 0;;
597
+      esac
598
+  done
599 599
 
600
-  data=$(tempfile 2>/dev/null)
601
-  trap "rm -f $data" 0 1 2 5 15
602
-  dialog --backtitle "Freedombone Configuration" \
603
-      --clear \
604
-      --insecure \
605
-      --passwordbox "Dynamic DNS provider password" 10 30 2> $data
606
-  sel=$?
607
-  case $sel in
608
-      0) DDNS_PASSWORD=$(cat $data);;
609
-      1) exit 0;;
610
-      255) exit 0;;
611
-  esac
612
-  data=$(tempfile 2>/dev/null)
613
-  trap "rm -f $data" 0 1 2 5 15
614
-  if [ ! $DDNS_PASSWORD ]; then
615
-      exit 7229
616
-  fi
600
+  while [ ! $DDNS_PASSWORD ]
601
+  do
602
+      data=$(tempfile 2>/dev/null)
603
+      trap "rm -f $data" 0 1 2 5 15
604
+      dialog --backtitle "Freedombone Configuration" \
605
+          --clear \
606
+          --insecure \
607
+          --passwordbox "Dynamic DNS provider password" 10 30 2> $data
608
+      sel=$?
609
+      case $sel in
610
+          0) DDNS_PASSWORD=$(cat $data);;
611
+          1) exit 0;;
612
+          255) exit 0;;
613
+      esac
614
+  done
617 615
 
618
-  data=$(tempfile 2>/dev/null)
619
-  trap "rm -f $data" 0 1 2 5 15
620
-  dialog --backtitle "Freedombone Configuration" \
621
-      --inputbox "Your full name (or nick)" 10 30 2> $data
622
-  sel=$?
623
-  case $sel in
624
-      0) MY_NAME=$(cat $data);;
625
-      1) exit 0;;
626
-      255) exit 0;;
627
-  esac
628
-  if [ ! $MY_NAME ]; then
629
-      exit 3784
630
-  fi
616
+  while [ ! $MY_NAME ]
617
+  do
618
+      data=$(tempfile 2>/dev/null)
619
+      trap "rm -f $data" 0 1 2 5 15
620
+      dialog --backtitle "Freedombone Configuration" \
621
+          --inputbox "Your full name (or nick)" 10 30 2> $data
622
+      sel=$?
623
+      case $sel in
624
+          0) MY_NAME=$(cat $data);;
625
+          1) exit 0;;
626
+          255) exit 0;;
627
+      esac
628
+  done
631 629
 
632 630
   data=$(tempfile 2>/dev/null)
633 631
   trap "rm -f $data" 0 1 2 5 15
@@ -644,14 +642,6 @@ function interactive_configuration {
644 642
   esac
645 643
   LOCAL_NETWORK_STATIC_IP_ADDRESS=$(cat $data | sed -n 1p)
646 644
   ROUTER_IP_ADDRESS=$(cat $data | sed -n 2p)
647
-  echo "local $LOCAL_NETWORK_STATIC_IP_ADDRESS"
648
-  echo "router $ROUTER_IP_ADDRESS"
649
-  if [ ! $LOCAL_NETWORK_STATIC_IP_ADDRESS ]; then
650
-      exit 6950
651
-  fi
652
-  if [ ! $ROUTER_IP_ADDRESS ]; then
653
-      exit 7582
654
-  fi
655 645
 
656 646
   data=$(tempfile 2>/dev/null)
657 647
   trap "rm -f $data" 0 1 2 5 15
@@ -734,6 +724,9 @@ function interactive_configuration {
734 724
           esac
735 725
           MY_BLOG_TITLE=$(cat $data | sed -n 1p)
736 726
           FULLBLOG_DOMAIN_NAME=$(cat $data | sed -n 2p)
727
+          if [[ $FULLBLOG_DOMAIN_NAME == "$WIKI_DOMAIN_NAME" ]]; then
728
+              FULLBLOG_DOMAIN_NAME=""
729
+          fi
737 730
       done
738 731
       if [ ! $DOMAIN_NAME ]; then
739 732
           DOMAIN_NAME=$FULLBLOG_DOMAIN_NAME
@@ -845,6 +838,9 @@ function interactive_configuration {
845 838
               255) exit 0;;
846 839
           esac
847 840
           MICROBLOG_DOMAIN_NAME=$(cat $data | sed -n 1p)
841
+          if [[ $MICROBLOG_DOMAIN_NAME == "$REDMATRIX_DOMAIN_NAME" ]]; then
842
+              MICROBLOG_DOMAIN_NAME=""
843
+          fi
848 844
       done
849 845
       if [ ! $DOMAIN_NAME ]; then
850 846
           DOMAIN_NAME=$MICROBLOG_DOMAIN_NAME
@@ -858,50 +854,50 @@ function interactive_configuration {
858 854
   fi
859 855
 
860 856
   if [ ! $DOMAIN_NAME ]; then
861
-      data=$(tempfile 2>/dev/null)
862
-      trap "rm -f $data" 0 1 2 5 15
863
-      dialog --backtitle "Freedombone Configuration" \
864
-          --inputbox "Domain name" 10 30 2> $data
865
-      sel=$?
866
-      case $sel in
867
-          0) DOMAIN_NAME=$(cat $data);;
868
-          1) exit 0;;
869
-          255) exit 0;;
870
-      esac
871
-      if [ ! $DOMAIN_NAME ]; then
872
-          exit 3846
873
-      fi
874
-
875
-      if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
857
+      while [ ! $DOMAIN_NAME ]
858
+      do
876 859
           data=$(tempfile 2>/dev/null)
877 860
           trap "rm -f $data" 0 1 2 5 15
878 861
           dialog --backtitle "Freedombone Configuration" \
879
-              --inputbox "FreeDNS subdomain code" 10 30 2> $data
862
+              --inputbox "Domain name" 10 30 2> $data
880 863
           sel=$?
881 864
           case $sel in
882
-              0) FREEDNS_SUBDOMAIN_CODE=$(cat $data);;
865
+              0) DOMAIN_NAME=$(cat $data);;
883 866
               1) exit 0;;
884 867
               255) exit 0;;
885 868
           esac
886
-          if [ ! $FREEDNS_SUBDOMAIN_CODE ]; then
887
-              exit 7422
888
-          fi
869
+      done
870
+
871
+      if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
872
+          while [ ! $FREEDNS_SUBDOMAIN_CODE ]
873
+          do
874
+              data=$(tempfile 2>/dev/null)
875
+              trap "rm -f $data" 0 1 2 5 15
876
+              dialog --backtitle "Freedombone Configuration" \
877
+                  --inputbox "FreeDNS subdomain code" 10 30 2> $data
878
+              sel=$?
879
+              case $sel in
880
+                  0) FREEDNS_SUBDOMAIN_CODE=$(cat $data);;
881
+                  1) exit 0;;
882
+                  255) exit 0;;
883
+              esac
884
+          done
889 885
       fi
890 886
   fi
891 887
 
892
-  data=$(tempfile 2>/dev/null)
893
-  trap "rm -f $data" 0 1 2 5 15
894
-  dialog --backtitle "Freedombone Configuration" \
895
-      --inputbox "Your email address" 10 30 "$MY_USERNAME@$DOMAIN_NAME" 2> $data
896
-  sel=$?
897
-  case $sel in
898
-      0) MY_EMAIL_ADDRESS=$(cat $data);;
899
-      1) exit 0;;
900
-      255) exit 0;;
901
-  esac
902
-  if [ ! $MY_EMAIL_ADDRESS ]; then
903
-      exit 8357
904
-  fi
888
+  while [ ! $MY_EMAIL_ADDRESS ]
889
+  do
890
+      data=$(tempfile 2>/dev/null)
891
+      trap "rm -f $data" 0 1 2 5 15
892
+      dialog --backtitle "Freedombone Configuration" \
893
+          --inputbox "Your email address" 10 30 "$MY_USERNAME@$DOMAIN_NAME" 2> $data
894
+      sel=$?
895
+      case $sel in
896
+          0) MY_EMAIL_ADDRESS=$(cat $data);;
897
+          1) exit 0;;
898
+          255) exit 0;;
899
+      esac
900
+  done
905 901
 
906 902
   save_configuration_file
907 903