hu hao 5 年之前
父節點
當前提交
b80eb6c392
共有 2 個文件被更改,包括 14 次插入6 次删除
  1. 0 2
      ci/executeCommand.sh
  2. 14 4
      ci/judgePush.sh

+ 0 - 2
ci/executeCommand.sh

@@ -17,8 +17,6 @@ for file in `ls $update_path`
             sudo yarn install
         elif [ "resources" == "$file" ]; then
             sudo yarn run prod
-            else
-                echo "11"
         fi
     done
 

+ 14 - 4
ci/judgePush.sh

@@ -7,13 +7,12 @@ path=$1
 # shellcheck disable=SC2164
 cd "$update_path"
 # shellcheck disable=SC2035
-sudo rm -rf *
-# shellcheck disable=SC2164
-cd "$path"
+rm -rf *
+
 #将项目文件中3分钟之前改动的文件存到update文件
 # shellcheck disable=SC2038
 # shellcheck disable=SC2185
-find -mmin -3 |grep -v .git|xargs -I {} cp -r {} -u -t $update_path
+#find -mmin -3 |grep -v .git|xargs -I {} cp -r {} -u -t $update_path
 #find -mtime -1 |grep -v .git|grep -v vendor|xargs -I {} cp -r {} /var/www/update/
 
 # shellcheck disable=SC2045
@@ -24,3 +23,14 @@ find -mmin -3 |grep -v .git|xargs -I {} cp -r {} -u -t $update_path
 #            sudo composer install
 #        fi
 #    done
+
+for menu in `cd "$path" && find -type f -mmin -5 |grep -v .git|grep -v vendor`
+    do
+    #判断文件夹是否存在
+        # shellcheck disable=SC2046
+        if [ $(dirname "${menu#./}") != "." ]; then
+             mkdir -p $(dirname "${menu#./}") && cp  "$path"/"${menu#./}" /var/www/update/$(dirname "${menu#./}")
+            else
+                cp -r "$path"/"${menu#./}" /var/www/update
+        fi
+    done