004sync_code_test.sh

dsl/004sync_code_test.sh

@@ -181,43 +181,44 @@ sync_files() {
   echo -e "$echoPrefix 处理前端资源缓存-完成 $echoSuffix"
 }
 
+msg=${1:-"代码同步"}
+#echo "[$msg]"
+
 commit_target() {
   echo -e "$echoPrefix cd $target_path $echoSuffix"
   cd $target_path
   echo -e "$echoPrefix git add --all . $echoSuffix"
   git add --all .
-  echo -e "$echoPrefix git commit -m '代码同步' $echoSuffix"
-  git commit -m '代码同步'
+  echo -e "$echoPrefix git commit -m '$msg' $echoSuffix"
+  git commit -m "$msg"
   echo -e "$echoPrefix git push -v origin $target_branch $echoSuffix"
   git push -v origin $target_branch
 }
 
-#source_pull
-#target_pull
-#source_build
-#target_pull
-#sync_files
-#target_build
-#commit_target
+source_pull
+target_pull
+source_build
+target_pull
+sync_files
+target_build
+commit_target
 
-msg=${1:-"代码同步"}
-echo "[$msg]"
 kls_source_path=/home/www/sync_code/sd_dsl/wms85std-sd-dsl-test
 
-#echo -e "$echoPrefix cd $kls_source_path $echoSuffix"
-#cd $kls_source_path
-#echo -e "$echoPrefix git checkout -b release/test kls/release/test $echoSuffix"
-#git checkout -b release/test kls/release/test || true
-#echo -e "$echoPrefix git checkout release/test $echoSuffix"
-#git checkout release/test
-#echo -e "$echoPrefix git pull kls release/test:release/test -f $echoSuffix"
-#git pull kls release/test:release/test -f
-#
-#echo -e "$echoPrefix git push -v dsl release/test:release/test -f $echoSuffix"
-#git push -v dsl release/test:release/test -f
-#echo ""
-#echo "接下来：登录大参林能笑平台，等待构建完成，手动部署应用。[$(date +%Y-%m-%d' '%H:%M:%S)]"
-
-echo "维护中，请稍候..."
+echo -e "$echoPrefix cd $kls_source_path $echoSuffix"
+cd $kls_source_path
+echo -e "$echoPrefix git checkout -b release/test kls/release/test $echoSuffix"
+git checkout -b release/test kls/release/test || true
+echo -e "$echoPrefix git checkout release/test $echoSuffix"
+git checkout release/test
+echo -e "$echoPrefix git pull kls release/test:release/test -f $echoSuffix"
+git pull kls release/test:release/test -f
+
+echo -e "$echoPrefix git push -v dsl release/test:release/test -f $echoSuffix"
+git push -v dsl release/test:release/test -f
+echo ""
+echo "接下来：登录大参林能笑平台，等待构建完成，手动部署应用。[$(date +%Y-%m-%d' '%H:%M:%S)]"
+
+#echo "维护中，请稍候..."
 
 # bash <(curl -s http://git.galaxis.yvanui.com/lizw/jztd-deploy/raw/branch/master/dsl/004sync_code_test.sh)