Browse Source

Allow developer tools installation to be skipped

Bob Mottram 10 years ago
parent
commit
2fd4094850
2 changed files with 7 additions and 2 deletions
  1. 3
    0
      src/freedombone
  2. 4
    2
      src/freedombone-config

+ 3
- 0
src/freedombone View File

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

+ 4
- 2
src/freedombone-config View File

888
           if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
888
           if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
889
               dialog --backtitle "Freedombone Configuration" \
889
               dialog --backtitle "Freedombone Configuration" \
890
                      --title "Developer Configuration" \
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
                      "Domain:" 1 1 "$(grep 'GIT_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 40 \
892
                      "Domain:" 1 1 "$(grep 'GIT_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 40 \
893
                      "Code:" 2 1 "$(grep 'GIT_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 40 \
893
                      "Code:" 2 1 "$(grep 'GIT_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 40 \
894
                      2> $data
894
                      2> $data
895
           else
895
           else
896
               dialog --backtitle "Freedombone Configuration" \
896
               dialog --backtitle "Freedombone Configuration" \
897
                      --title "Developer Configuration" \
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
                      "Domain:" 1 1 "$(grep 'GIT_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 40 \
899
                      "Domain:" 1 1 "$(grep 'GIT_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 40 \
900
                      2> $data
900
                      2> $data
901
           fi
901
           fi
920
                       fi
920
                       fi
921
                   fi
921
                   fi
922
               fi
922
               fi
923
+          else
924
+              DEVELOPER_DETAILS_COMPLETE="yes"
923
           fi
925
           fi
924
           if [ $GIT_DOMAIN_NAME ]; then
926
           if [ $GIT_DOMAIN_NAME ]; then
925
               DEVELOPER_DETAILS_COMPLETE="yes"
927
               DEVELOPER_DETAILS_COMPLETE="yes"