소스 검색

Better handling of the freedns code

Bob Mottram 10 년 전
부모
커밋
abd244b1a3
1개의 변경된 파일79개의 추가작업 그리고 49개의 파일을 삭제
  1. 79
    49
      src/freedombone

+ 79
- 49
src/freedombone 파일 보기

@@ -684,16 +684,22 @@ function interactive_configuration {
684 684
           esac
685 685
           WIKI_TITLE=$(cat $data | sed -n 1p)
686 686
           WIKI_DOMAIN_NAME=$(cat $data | sed -n 2p)
687
-      done
688
-      if [ ! $DOMAIN_NAME ]; then
689
-          DOMAIN_NAME=$WIKI_DOMAIN_NAME
690
-      fi
691
-      if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
692
-          WIKI_FREEDNS_SUBDOMAIN_CODE=$(cat $data | sed -n 3p)
693
-          if [[ $DOMAIN_NAME == "$WIKI_DOMAIN_NAME" ]]; then
694
-              FREEDNS_SUBDOMAIN_CODE=$WIKI_FREEDNS_SUBDOMAIN_CODE
687
+          if [ $WIKI_DOMAIN_NAME ]; then
688
+              if [ ! $DOMAIN_NAME ]; then
689
+                  DOMAIN_NAME=$WIKI_DOMAIN_NAME
690
+              fi
691
+              if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
692
+                  WIKI_FREEDNS_SUBDOMAIN_CODE=$(cat $data | sed -n 3p)
693
+                  if [ ! $WIKI_FREEDNS_SUBDOMAIN_CODE ]; then
694
+                      WIKI_DOMAIN_NAME=""
695
+                  else
696
+                      if [[ $DOMAIN_NAME == "$WIKI_DOMAIN_NAME" ]]; then
697
+                          FREEDNS_SUBDOMAIN_CODE=$WIKI_FREEDNS_SUBDOMAIN_CODE
698
+                      fi
699
+                  fi
700
+              fi
695 701
           fi
696
-      fi
702
+      done
697 703
   fi
698 704
 
699 705
   if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_FULL" ]]; then
@@ -724,19 +730,25 @@ function interactive_configuration {
724 730
           esac
725 731
           MY_BLOG_TITLE=$(cat $data | sed -n 1p)
726 732
           FULLBLOG_DOMAIN_NAME=$(cat $data | sed -n 2p)
727
-          if [[ $FULLBLOG_DOMAIN_NAME == "$WIKI_DOMAIN_NAME" ]]; then
728
-              FULLBLOG_DOMAIN_NAME=""
733
+          if [ $FULLBLOG_DOMAIN_NAME ]; then
734
+              if [[ $FULLBLOG_DOMAIN_NAME == "$WIKI_DOMAIN_NAME" ]]; then
735
+                  FULLBLOG_DOMAIN_NAME=""
736
+              fi
737
+              if [ ! $DOMAIN_NAME ]; then
738
+                  DOMAIN_NAME=$FULLBLOG_DOMAIN_NAME
739
+              fi
740
+              if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
741
+                  FULLBLOG_FREEDNS_SUBDOMAIN_CODE=$(cat $data | sed -n 3p)
742
+                  if [ ! $FULLBLOG_FREEDNS_SUBDOMAIN_CODE ]; then
743
+                      FULLBLOG_DOMAIN_NAME=""
744
+                  else
745
+                      if [[ $DOMAIN_NAME == "$FULLBLOG_DOMAIN_NAME" ]]; then
746
+                          FREEDNS_SUBDOMAIN_CODE=$FULLBLOG_FREEDNS_SUBDOMAIN_CODE
747
+                      fi
748
+                  fi
749
+              fi
729 750
           fi
730 751
       done
731
-      if [ ! $DOMAIN_NAME ]; then
732
-          DOMAIN_NAME=$FULLBLOG_DOMAIN_NAME
733
-      fi
734
-      if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
735
-          FULLBLOG_FREEDNS_SUBDOMAIN_CODE=$(cat $data | sed -n 3p)
736
-          if [[ $DOMAIN_NAME == "$FULLBLOG_DOMAIN_NAME" ]]; then
737
-              FREEDNS_SUBDOMAIN_CODE=$FULLBLOG_FREEDNS_SUBDOMAIN_CODE
738
-          fi
739
-      fi
740 752
   fi
741 753
 
742 754
   if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_FULL" ]]; then
@@ -764,16 +776,22 @@ function interactive_configuration {
764 776
               255) exit 0;;
765 777
           esac
766 778
           OWNCLOUD_DOMAIN_NAME=$(cat $data | sed -n 1p)
767
-      done
768
-      if [ ! $DOMAIN_NAME ]; then
769
-          DOMAIN_NAME=$OWNCLOUD_DOMAIN_NAME
770
-      fi
771
-      if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
772
-          OWNCLOUD_FREEDNS_SUBDOMAIN_CODE=$(cat $data | sed -n 2p)
773
-          if [[ $DOMAIN_NAME == "$OWNCLOUD_DOMAIN_NAME" ]]; then
774
-              FREEDNS_SUBDOMAIN_CODE=$OWNCLOUD_FREEDNS_SUBDOMAIN_CODE
779
+          if [ $OWNCLOUD_DOMAIN_NAME ]; then
780
+              if [ ! $DOMAIN_NAME ]; then
781
+                  DOMAIN_NAME=$OWNCLOUD_DOMAIN_NAME
782
+              fi
783
+              if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
784
+                  OWNCLOUD_FREEDNS_SUBDOMAIN_CODE=$(cat $data | sed -n 2p)
785
+                  if [ ! $OWNCLOUD_FREEDNS_SUBDOMAIN_CODE ]; then
786
+                      OWNCLOUD_DOMAIN_NAME=""
787
+                  else
788
+                      if [[ $DOMAIN_NAME == "$OWNCLOUD_DOMAIN_NAME" ]]; then
789
+                          FREEDNS_SUBDOMAIN_CODE=$OWNCLOUD_FREEDNS_SUBDOMAIN_CODE
790
+                      fi
791
+                  fi
792
+              fi
775 793
           fi
776
-      fi
794
+      done
777 795
   fi
778 796
 
779 797
   if [[ $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_FULL" ]]; then
@@ -801,16 +819,22 @@ function interactive_configuration {
801 819
               255) exit 0;;
802 820
           esac
803 821
           REDMATRIX_DOMAIN_NAME=$(cat $data | sed -n 1p)
804
-      done
805
-      if [ ! $DOMAIN_NAME ]; then
806
-          DOMAIN_NAME=$REDMATRIX_DOMAIN_NAME
807
-      fi
808
-      if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
809
-          REDMATRIX_FREEDNS_SUBDOMAIN_CODE=$(cat $data | sed -n 2p)
810
-          if [[ $DOMAIN_NAME == "$REDMATRIX_DOMAIN_NAME" ]]; then
811
-              FREEDNS_SUBDOMAIN_CODE=$REDMATRIX_FREEDNS_SUBDOMAIN_CODE
822
+          if [ $REDMATRIX_DOMAIN_NAME ]; then
823
+              if [ ! $DOMAIN_NAME ]; then
824
+                  DOMAIN_NAME=$REDMATRIX_DOMAIN_NAME
825
+              fi
826
+              if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
827
+                  REDMATRIX_FREEDNS_SUBDOMAIN_CODE=$(cat $data | sed -n 2p)
828
+                  if [ ! $REDMATRIX_FREEDNS_SUBDOMAIN_CODE ]; then
829
+                      REDMATRIX_DOMAIN_NAME=""
830
+                  else
831
+                      if [[ $DOMAIN_NAME == "$REDMATRIX_DOMAIN_NAME" ]]; then
832
+                          FREEDNS_SUBDOMAIN_CODE=$REDMATRIX_FREEDNS_SUBDOMAIN_CODE
833
+                      fi
834
+                  fi
835
+              fi
812 836
           fi
813
-      fi
837
+      done
814 838
   fi
815 839
 
816 840
   if [[ $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_FULL" ]]; then
@@ -838,19 +862,25 @@ function interactive_configuration {
838 862
               255) exit 0;;
839 863
           esac
840 864
           MICROBLOG_DOMAIN_NAME=$(cat $data | sed -n 1p)
841
-          if [[ $MICROBLOG_DOMAIN_NAME == "$REDMATRIX_DOMAIN_NAME" ]]; then
842
-              MICROBLOG_DOMAIN_NAME=""
865
+          if [ $MICROBLOG_DOMAIN_NAME ]; then
866
+              if [[ $MICROBLOG_DOMAIN_NAME == "$REDMATRIX_DOMAIN_NAME" ]]; then
867
+                  MICROBLOG_DOMAIN_NAME=""
868
+              fi
869
+              if [ ! $DOMAIN_NAME ]; then
870
+                  DOMAIN_NAME=$MICROBLOG_DOMAIN_NAME
871
+              fi
872
+              if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
873
+                  MICROBLOG_FREEDNS_SUBDOMAIN_CODE=$(cat $data | sed -n 2p)
874
+                  if [ ! $MICROBLOG_FREEDNS_SUBDOMAIN_CODE ]; then
875
+                      MICROBLOG_DOMAIN_NAME=""
876
+                  else
877
+                      if [[ $DOMAIN_NAME == "$MICROBLOG_DOMAIN_NAME" ]]; then
878
+                          FREEDNS_SUBDOMAIN_CODE=$MICROBLOG_FREEDNS_SUBDOMAIN_CODE
879
+                      fi
880
+                  fi
881
+              fi
843 882
           fi
844 883
       done
845
-      if [ ! $DOMAIN_NAME ]; then
846
-          DOMAIN_NAME=$MICROBLOG_DOMAIN_NAME
847
-      fi
848
-      if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
849
-          MICROBLOG_FREEDNS_SUBDOMAIN_CODE=$(cat $data | sed -n 2p)
850
-          if [[ $DOMAIN_NAME == "$MICROBLOG_DOMAIN_NAME" ]]; then
851
-              FREEDNS_SUBDOMAIN_CODE=$MICROBLOG_FREEDNS_SUBDOMAIN_CODE
852
-          fi
853
-      fi
854 884
   fi
855 885
 
856 886
   if [ ! $DOMAIN_NAME ]; then