Merge pull request #1930 from subutai-io/dev

Dev
subutai-io · Jun 24, 2020 · d58ea74 · d58ea74
2 parents 78e0fc9 + df1a84c
commit d58ea74
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/build_mac.sh b/build_mac.sh
@@ -7,10 +7,10 @@ echo "$BRANCH"
 
 export PATH=$QTBINPATH:$PATH
 
-git checkout -- .
-git pull
-git checkout $BRANCH
-git pull origin $BRANCH
+#git checkout -- .
+#git pull
+#git checkout $BRANCH
+#git pull origin $BRANCH
 
 mkdir -p /usr/local/opt/libssh2/lib/
 mkdir -p /usr/local/lib/

diff --git a/build_win.bat b/build_win.bat
@@ -96,3 +96,7 @@ if "%APPVEYOR_REPO_BRANCH%" == "head" (
 if "%APPVEYOR_REPO_BRANCH%" == "HEAD" (
   copy "C:\SRC\SubutaiTraySetup\SubutaiTraySetup\Release\SubutaiControlCenter.msi" "C:\SRC\control-center\subutai_control_center_bin\subutai-control-center.msi"  
 )
+
+if "%APPVEYOR_REPO_TAG%" == "true" (
+  copy "C:\SRC\SubutaiTraySetup\SubutaiTraySetup\Release\SubutaiControlCenter.msi" "C:\SRC\control-center\subutai_control_center_bin\subutai-control-center.msi"  
+)
diff --git a/pack_mac.sh b/pack_mac.sh
@@ -9,7 +9,8 @@ cp SubutaiControlCenter_osx ../../../.
 
 cd $TRAYDIR
 
-PKGNAME="subutai-control-center.pkg"
+PKGNAME="subutai-control-center-unsigned.pkg"
+PKGNAME_S="subutai-control-center.pkg"
 case $BRANCH in
 	dev)
 		PKGNAME="subutai-control-center-dev-unsigned.pkg"
@@ -19,14 +20,6 @@ case $BRANCH in
 		PKGNAME="subutai-control-center-master-unsigned.pkg"
 		PKGNAME_S="subutai-control-center-master.pkg"
 		;;
-	head)
-		PKGNAME="subutai-control-center-unsigned.pkg"   
-		PKGNAME_S="subutai-control-center.pkg"
-    	;;
-    HEAD)
-		PKGNAME="subutai-control-center.pkg"
-		PKGNAME_S="subutai-control-center.pkg"
-    	;;  
 esac
 
 cd darwin-packages/