2020-05-07 11:45:19

This commit is contained in:
monlor
2020-05-07 11:45:20 +08:00
parent 62d9266963
commit c5e753740c
5 changed files with 25 additions and 17 deletions

View File

@@ -19,28 +19,36 @@ on:
jobs:
coding-deploy:
runs-on: ubuntu-latest
env:
CO_REF: ${{ secrets.CO_REF }}
BRANCH_NAME: ${{ github.ref }}
steps:
- name: Checkout
uses: actions/checkout@master
- name: Deploy To Coding
env:
CO_REF: ${{ secrets.CO_REF }}
BRANCH_NAME: ${{ github.ref }}
run: |
git clone -b `basename ${BRANCH_NAME}` ${CO_REF}
bash ./tools/gitsync.sh pack
bash ./tools/gitsync.sh deploy_lfs mbfiles `basename ${BRANCH_NAME}` ${CO_REF}
./tools/gitsync.sh pack
./tools/gitsync.sh deploy_lfs mbfiles `basename ${BRANCH_NAME}` ${CO_REF}
github-deploy:
runs-on: ubuntu-latest
env:
GH_REF: ${{ secrets.GH_REF }}
BRANCH_NAME: ${{ github.ref }}
steps:
- name: Checkout
uses: actions/checkout@master
- name: Deploy To GitHub
env:
GH_REF: ${{ secrets.GH_REF }}
BRANCH_NAME: ${{ github.ref }}
run: |
git clone -b `basename ${BRANCH_NAME}` ${GH_REF}
bash ./tools/gitsync.sh pack
bash ./tools/gitsync.sh deploy mbfiles `basename ${BRANCH_NAME}` ${GH_REF}
./tools/gitsync.sh pack
./tools/gitsync.sh deploy mbfiles `basename ${BRANCH_NAME}` ${GH_REF}
- name: Sync To Gitee
uses: wearerequired/git-mirror-action@v1
env:
SSH_PRIVATE_KEY: ${{ secrets.GE_TOKEN }}
with:
source-repo: 'git@github.com:monlor/mbfiles.git'
destination-repo: 'git@gitee.com:monlor/mbfiles.git'

View File

@@ -4,8 +4,8 @@ export PATH=$PATH:/etc/mixbox/bin
mburl_coding="https://monlor.coding.net/p/mbfiles/d/mbfiles/git/raw/master"
mburl_github="https://raw.githubusercontent.com/monlor/mbfiles/master"
# mburl_test="https://monlor.coding.net/p/mbfiles/d/mbfiles/git/raw/test"
mburl=$(mbdb get mixbox.main.url) || mburl="$mburl_coding"
mburl_gitee="https://gitee.com/monlor/mbfiles/raw/master"
mburl=$(mbdb get mixbox.main.url) || mburl="$mburl_gitee"
mbroot=$(mbdb get mixbox.main.path)
mbdisk=$(mbdb get mixbox.main.mbdisk)
mbbackup="/etc/mbbackup"

View File

@@ -171,20 +171,20 @@ modify_source() {
case "$mburl" in
"$mburl_coding") url_text="coding下载源" ;;
"$mburl_github") url_text="github下载源" ;;
# "$mburl_test") url_text="coding测试源" ;;
"$mburl_gitee") url_text="gitee下载源" ;;
*) url_text="$mburl" ;;
esac
echo "下载源【$url_text】使用中"
echo "0. 不修改"
echo "1. coding下载源"
echo "2. github下载源"
# echo "3. coding测试源(推荐)"
echo "3. gitee下载源(推荐)"
read -p "请选择或输入下载源:" res
case "$res" in
0) return ;;
1) mburl_tmp="$mburl_coding" ;;
2) mburl_tmp="$mburl_github" ;;
# 3) mburl_tmp="$mburl_test" ;;
3) mburl_tmp="$mburl_gitee" ;;
*) [ -n "$res" ] && mburl_tmp="$res" ;;
esac
if [ -n "$mburl_tmp" ]; then

View File

@@ -4,4 +4,4 @@ needver=""
supports="linux_arm,linux_mips,linux_x86_64"
appinfo="一款支持多平台多架构的Shell工具箱"
newinfo="修复插件列表为空的bug"
version="0.1.9.8"
version="0.1.9.9"

View File

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