修改ci

.github/workflows/deploy.yaml

@@ -42,18 +42,3 @@ jobs:
         bash ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${GH_REF}
         bash ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${CO_REF}
 
-  dev-job:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@master
-
-    - name: Pack And Deploy
-      env:
-        BRANCH_NAME: dev
-      run: |
-        git fetch origin ${BRANCH_NAME}
-        git checkout ${BRANCH_NAME}
-        bash ./tools/gitsync.sh pack 
-        bash ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${GH_REF}
-        bash ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${CO_REF}

.github/workflows/main.yml

@@ -6,7 +6,10 @@ on:
     branchs:  
       - master
       - test
-      - dev
+    tags-ignore:
+      - deploy-*
+      - test-*
+      - master-*
     ignore-paths:
       - '.github'
       - 'README.md'
@@ -20,6 +23,7 @@ jobs:
     env:
         GH_REF: ${{ secrets.GH_REF }}
         CO_REF: ${{ secrets.CO_REF }}
+        BRANCH_NAME: ${{ github.ref }}
     steps:
     - name: Checkout
       uses: actions/checkout@master
@@ -27,5 +31,5 @@ jobs:
     - name: Pack And Deploy
       run: |
         bash ./tools/gitsync.sh pack 
-        bash ./tools/gitsync.sh deploy mbfiles `git branch | awk  '$1 == "*"{print $2}'` ${GH_REF}
-        bash ./tools/gitsync.sh deploy mbfiles `git branch | awk  '$1 == "*"{print $2}'` ${CO_REF}
+        bash ./tools/gitsync.sh deploy mbfiles `basename ${BRANCH_NAME}` ${GH_REF}
+        bash ./tools/gitsync.sh deploy mbfiles `basename ${BRANCH_NAME}` ${CO_REF}

.github/workflows/master.yaml

@@ -20,6 +20,7 @@ jobs:
       env:
         BRANCH_NAME: master
       run: |
+        git fetch origin ${BRANCH_NAME}
         git checkout ${BRANCH_NAME}
         bash ./tools/gitsync.sh pack 
         bash ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${GH_REF}

README.md

@@ -1,6 +1,6 @@
 # MIXBOX 
 
-![](https://github.com/monlor/MIXBOX/workflows/CI/badge.svg)
+![](https://github.com/monlor/MIXBOX/workflows/Main-CI/badge.svg)
 
 > MIXBOX是一款全新的，完全基于Shell脚本的工具箱，为在路由器上实现程序的快速配置及运行管理，欢迎大佬们stars、fork及pr.
 

apps/mixbox/scripts/uninstall.sh

@@ -11,7 +11,7 @@ logsh "【Tools】" "正在卸载工具箱..."
 
 logsh "【Tools】" "停止所有插件"
 
-ls ${mbroot}/apps | while read line
+ls ${mbroot}/apps 2> /dev/null | while read line
 do
 	result=$(mbdb get ${line}.main.enable)
 	if [ "$result" == '1' ]; then

install.sh

@@ -17,7 +17,7 @@ logsh "【Tools】" "请按任意键安装工具箱(Ctrl + C 退出)."
 read answer
 #check root
 # [ "$USER" != "root" ] && logsh "【Tools】"  "请使用root用户安装工具箱！" && exit 1
-mburl="https://gitee.com/monlor/mbfiles/raw/master"   
+mburl="https://monlor.coding.net/p/mbfiles/d/mbfiles/git/raw/master"
 mbtmp="/tmp/mbtmp"
 [ ! -d "${mbtmp}" ] && mkdir -p ${mbtmp}
 model=$(uname -ms | tr ' ' '_' | tr '[A-Z]' '[a-z]')

tools/gitsync.sh

@@ -104,7 +104,7 @@ reset() {
 # $3: remote url with token
 deploy() {
 
-	sed -Ei "s#mbfiles/raw/[a-z]+#mbfiles/raw/$2#" $1/install.sh
+	sed -Ei "s#mbfiles/git/raw/[a-z]+#mbfiles/git/raw/$2#" $1/install.sh
 
 	cd $1
   git init