소스 검색

Revert "added the ability to choose a branch"

FusionPBX 9 년 전
부모
커밋
727f0f88b3
1개의 변경된 파일18개의 추가작업 그리고 21개의 파일을 삭제
  1. 18 21
      install/ubuntu/install_fusionpbx.sh

+ 18 - 21
install/ubuntu/install_fusionpbx.sh

@@ -74,6 +74,11 @@ fi
 #DEFINES
 #-------
 VERSION="Version - using subversion, no longer keeping track. WAF License"
+#latest release
+#FPBXBRANCH="http://fusionpbx.googlecode.com/svn/trunk/fusionpbx"
+#dev branch
+FPBXBRANCH="http://fusionpbx.googlecode.com/svn/branches/dev/fusionpbx"
+
 FSGIT=https://freeswitch.org/stash/scm/fs/freeswitch.git
 
 FSSTABLE=true
@@ -107,6 +112,10 @@ INST_FPBX=git
 #TGZ_FILE="/home/coltpbx/fusionpbx-1.2.1.tar.gz"
 FUSIONPBX_GIT=https://github.com/fusionpbx/fusionpbx.git
 
+FUSIONPBX_STABLE=false
+
+FUSIONPBX_STABLE_VERSION="4.0"
+
 FSREV=false
 #IF FSCHECKOUTVER is true, FSSTABLE needs to be false
 FSCHECKOUTVER=false
@@ -2420,27 +2429,15 @@ DELIM
 			/bin/tar -C $WWW_PATH -xzvf $TGZ_FILE
 	elif [ $INST_FPBX == git ]; then
 		    /usr/bin/git clone $FUSIONPBX_GIT
-			branches=()
-			eval "$(git for-each-ref --shell --format='branches+=(%(refname:short))' refs/heads/)"
-			for id in "${!branches[@]}";
-			do
-				branch=${branches[$id]};
-				printf "%s)%s" $id $branch;
-				if [ $branch == 'master' ];
-				then printf " *default";
-				fi
-				printf "\n";
-			
-			done
-			while true;
-			do
-				read -p "Which branch would you like to use? " branch
-				if [[ -n "${branches[$branch]}" ]];
-				then break;
-				fi;
-				echo "Please choose a existing branch.";
-			done
-			/usr/bin/git checkout "${branches[$branch]}"
+		    if [ $FUSIONPBX_STABLE == true ]; then
+		        /bin/echo "Using FusionPBX Stable $FUSIONPBX_STABLE_VERSION From GitHub"
+		        cd $WWW_PATH/fusionpbx
+			/usr/bin/git checkout $FUSIONPBX_STABLE_VERSION
+		    else
+		        /bin/echo "Beware.. Using FusionPBX Master From GitHub"
+		        cd $WWW_PATH/fusionpbx
+			/usr/bin/git checkout master
+		    fi
 	fi
 	if [ ! -e $WWW_PATH/$GUI_NAME ]; then
 		/bin/mv $WWW_PATH/fusionpbx $WWW_PATH/$GUI_NAME