Преглед изворни кода

Allow developer tools installation to be skipped

Bob Mottram пре 10 година
родитељ
комит
2fd4094850
2 измењених фајлова са 7 додато и 2 уклоњено
  1. 3
    0
      src/freedombone
  2. 4
    2
      src/freedombone-config

+ 3
- 0
src/freedombone Прегледај датотеку

@@ -6476,6 +6476,9 @@ function install_gogs {
6476 6476
   if grep -Fxq "install_gogs" $COMPLETION_FILE; then
6477 6477
       return
6478 6478
   fi
6479
+  if [ ! $GIT_DOMAIN_NAME ]; then
6480
+      return
6481
+  fi
6479 6482
   # http://gogs.io/docs/installation/install_from_source.md
6480 6483
 
6481 6484
   # install Go

+ 4
- 2
src/freedombone-config Прегледај датотеку

@@ -888,14 +888,14 @@ function interactive_configuration {
888 888
           if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
889 889
               dialog --backtitle "Freedombone Configuration" \
890 890
                      --title "Developer Configuration" \
891
-                     --form "\nPlease enter your Git hosting site details:" 11 55 3 \
891
+                     --form "\nPlease enter your Git hosting site details.\nIf You don't need developer tools then just select Ok" 11 55 3 \
892 892
                      "Domain:" 1 1 "$(grep 'GIT_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 40 \
893 893
                      "Code:" 2 1 "$(grep 'GIT_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 40 \
894 894
                      2> $data
895 895
           else
896 896
               dialog --backtitle "Freedombone Configuration" \
897 897
                      --title "Developer Configuration" \
898
-                     --form "\nPlease enter your Git hosting site details:" 11 55 2 \
898
+                     --form "\nPlease enter your Git hosting site details.\nIf You don't need developer tools then just select Ok" 11 55 2 \
899 899
                      "Domain:" 1 1 "$(grep 'GIT_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 40 \
900 900
                      2> $data
901 901
           fi
@@ -920,6 +920,8 @@ function interactive_configuration {
920 920
                       fi
921 921
                   fi
922 922
               fi
923
+          else
924
+              DEVELOPER_DETAILS_COMPLETE="yes"
923 925
           fi
924 926
           if [ $GIT_DOMAIN_NAME ]; then
925 927
               DEVELOPER_DETAILS_COMPLETE="yes"