Bläddra i källkod

fixed bug on checking out specific version of FS.

James Rose 13 år sedan
förälder
incheckning
21f176b79a
1 ändrade filer med 9 tillägg och 8 borttagningar
  1. 9 8
      install/ubuntu/install_fusionpbx.sh

+ 9 - 8
install/ubuntu/install_fusionpbx.sh

@@ -97,6 +97,7 @@ INST_FPBX=svn
 #full path required
 #TGZ_FILE="/home/coltpbx/fusionpbx-1.2.1.tar.gz"
 FSREV="187abe02af4d64cdedc598bd3dfb1cd3ed0f4a91"
+#IF FSCHECKOUTVER is true, FSSTABLE needs to be false
 FSCHECKOUTVER=false
 FPBXREV="1876"
 FBPXCHECKOUTVER=false
@@ -842,6 +843,14 @@ if [ $DO_DAHDI == "y" ]; then
 				exit 1
 			fi
 		else
+			echo "going dev branch.  Hope this works for you."
+			/usr/bin/time /usr/bin/git clone $FSGIT
+			if [ $? -ne 0 ]; then
+				#git had an error
+				/bin/echo "GIT ERROR"
+				exit 1
+			fi
+			
 			if [ $FSCHECKOUTVER == true ]; then
 				echo "OK we'll check out FreeSWITCH version $FSREV"
 				cd /usr/src/freeswitch
@@ -851,14 +860,6 @@ if [ $DO_DAHDI == "y" ]; then
 					/bin/echo "GIT CHECKOUT ERROR"
 					exit 1
 				fi
-			else
-				echo "going dev branch.  Hope this works for you."
-				/usr/bin/time /usr/bin/git clone $FSGIT
-				if [ $? -ne 0 ]; then
-					#git had an error
-					/bin/echo "GIT ERROR"
-					exit 1
-				fi
 			fi
 			/bin/echo "git_done" >> /tmp/install_fusion_status
 		fi