|
@@ -207,12 +207,12 @@ kls_source_path=/home/www/sync_code/sd_dsl/wms85std-sd-dsl
|
|
|
|
|
|
echo -e "$echoPrefix cd $kls_source_path $echoSuffix"
|
|
echo -e "$echoPrefix cd $kls_source_path $echoSuffix"
|
|
cd $kls_source_path
|
|
cd $kls_source_path
|
|
-git checkout -b main kls/main
|
|
|
|
echo -e "$echoPrefix git checkout -b main kls/main $echoSuffix"
|
|
echo -e "$echoPrefix git checkout -b main kls/main $echoSuffix"
|
|
-git checkout main
|
|
|
|
|
|
+git checkout -b main kls/main || true
|
|
echo -e "$echoPrefix git checkout main $echoSuffix"
|
|
echo -e "$echoPrefix git checkout main $echoSuffix"
|
|
-git pull kls main:main -f
|
|
|
|
|
|
+git checkout main
|
|
echo -e "$echoPrefix git pull kls main:main -f $echoSuffix"
|
|
echo -e "$echoPrefix git pull kls main:main -f $echoSuffix"
|
|
|
|
+git pull kls main:main -f
|
|
|
|
|
|
if [ "$cmd" == "test" ];then
|
|
if [ "$cmd" == "test" ];then
|
|
echo -e "$echoPrefix git push dsl main:release/test -f $echoSuffix"
|
|
echo -e "$echoPrefix git push dsl main:release/test -f $echoSuffix"
|