From 0bb0ad279b2fac784dd73136f9605d3ed2e82e99 Mon Sep 17 00:00:00 2001 From: monlor Date: Thu, 5 Mar 2020 15:41:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B7=A5=E5=85=B7=E7=AE=B1ve?= =?UTF-8?q?rsioncmp=EF=BC=8C=E5=B0=9D=E8=AF=95=E4=BD=BF=E7=94=A8gitee?= =?UTF-8?q?=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/main.yml | 10 ++++++---- README.md | 6 +++--- apps/mixbox/bin/mixbox | 3 ++- apps/mixbox/bin/versioncmp_linux_arm | Bin 7852 -> 0 bytes apps/mixbox/bin/versioncmp_linux_mips | Bin 9233 -> 0 bytes apps/mixbox/bin/versioncmp_linux_x86_64 | Bin 17008 -> 0 bytes apps/mixbox/config/mixbox.uci | 2 +- apps/mixbox/scripts/helper.sh | 18 +++++++++++++++++- install.sh | 4 ++-- 9 files changed, 31 insertions(+), 12 deletions(-) delete mode 100644 apps/mixbox/bin/versioncmp_linux_arm delete mode 100644 apps/mixbox/bin/versioncmp_linux_mips delete mode 100644 apps/mixbox/bin/versioncmp_linux_x86_64 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 806320d..a3653d9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -53,8 +53,10 @@ jobs: cp -rf install.sh mbfiles/ - name: Push changes env: - GH_REF: ${{ secrets.GH_REF }} - CO_REF: ${{ secrets.CO_REF }} + GH_REF: github.com/monlor/mbfiles + GE_REF: gitee.com/monlor/mbfiles + GH_TOKEN: ${{ secrets.GH_TOKEN }} + GE_TOKEN: ${{ secrets.GE_TOKEN }} BRANCH_NAME: $(cd .. && git branch | awk '$1 == "*"{print $2}') run: | cd mbfiles/ @@ -64,5 +66,5 @@ jobs: git add . git commit -m "$(TZ='Asia/Shanghai' date "+%Y-%m-%d %H:%M:%S")" -a eval "git branch | grep -q "${BRANCH_NAME}" || git checkout -b "${BRANCH_NAME}"" - eval "git push "${GH_REF}" "${BRANCH_NAME}":"${BRANCH_NAME}" -f" - # eval "git push "${CO_REF}" "${BRANCH_NAME}":"${BRANCH_NAME}" -f" \ No newline at end of file + eval "git push "https://${GH_TOKEN}@${GH_REF}" "${BRANCH_NAME}":"${BRANCH_NAME}" -f" + eval "git push "https://${GE_TOKEN}@${GE_REF}" "${BRANCH_NAME}":"${BRANCH_NAME}" -f" diff --git a/README.md b/README.md index a62f4b1..dba2af6 100644 --- a/README.md +++ b/README.md @@ -88,19 +88,19 @@ #### 一键安装 ``` shell -sh -c "$(curl -kfsSl https://cdn.jsdelivr.net/gh/monlor/mbfiles@master/install.sh)" && source /etc/profile &> /dev/null +sh -c "$(curl -kfsSl https://gitee.com/monlor/mbfiles/raw/master/install.sh)" && source /etc/profile &> /dev/null ``` ### 手动更新命令 ``` shell -sh -c "$(curl -kfsSl https://cdn.jsdelivr.net/gh/monlor/MIXBOX@master/apps/mixbox/scripts/update.sh)" && source /etc/profile &> /dev/null +sh -c "$(curl -kfsSl https://raw.githubusercontent.com/monlor/MIXBOX/master/apps/mixbox/scripts/update.sh)" && source /etc/profile &> /dev/null ``` #### 卸载`Monlor Tools`工具箱 ``` shell -sh -c "$(curl -kfsSl https://cdn.jsdelivr.net/gh/monlor/mbfiles@master/temp/uninstall_old.sh)" && source /etc/profile &> /dev/null +sh -c "$(curl -kfsSl https://gitee.com/monlor/mbfiles/raw/master/temp/uninstall_old.sh)" && source /etc/profile &> /dev/null ``` #### 一键更新所有插件(请先更新工具箱) diff --git a/apps/mixbox/bin/mixbox b/apps/mixbox/bin/mixbox index 6233bd8..0cbd00c 100644 --- a/apps/mixbox/bin/mixbox +++ b/apps/mixbox/bin/mixbox @@ -130,12 +130,13 @@ backup() { cp -rf ${mbroot}/mbdb $mbbackup applist installed -n | while read line; do echo "$(mbdb get ${line}.main.backupfiles)" | tr ',' '\n' | while read file; do - [ -z "$file" ] && continue + [ -z "$file" ] && continue savepath="$(dirname $mbbackup/${line}/$file)" [ ! -d "$savepath" ] && mkdir -p $savepath cp -rf ${mbroot}/apps/${line}/$file $mbbackup/${line}/$file &> /dev/null done done + cp -rf ${mbroot}/config/applist.txt $mbbackup/applist.txt cp -rf ${mbroot}/scripts/userscript.sh $mbbackup/userscript.sh cp -rf ${mbroot}/mbdb $mbbackup/mbdb tar zcvf "$mbbackup".tar.gz $mbbackup > /dev/null 2>&1 diff --git a/apps/mixbox/bin/versioncmp_linux_arm b/apps/mixbox/bin/versioncmp_linux_arm deleted file mode 100644 index 9eae1851fdb3b8d09b3916ef8bd41969ab2bee5b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7852 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 Yg-v!=Cw%!!TR<+DiCJe!RC8Yb7yrBUXaE2J diff --git a/apps/mixbox/bin/versioncmp_linux_x86_64 b/apps/mixbox/bin/versioncmp_linux_x86_64 deleted file mode 100644 index e0c7a5b5cccf3bbdfc2fbf6a61fe7240975371ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17008 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 $2 => -1 +# $1 < $2 => 1 +# $1 = $2 => 0 +versioncmp() { + + [ "$1" = "$2" ] && echo -n "0" && return + + if test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; then + echo -n "-1" + else + echo -n "1" + fi + +} + diff --git a/install.sh b/install.sh index 1c55a36..bc14421 100644 --- a/install.sh +++ b/install.sh @@ -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]') @@ -55,7 +55,7 @@ else fi [ "$result" != "200" ] && logsh "【Tools】" "文件下载失败!" && exit 1 logsh "【Tools】" "解压工具箱文件" -tar -zxvf ${mbtmp}/mixbox.tar.gz -C ${mbtmp} +tar -zxvf ${mbtmp}/mixbox.tar.gz -C ${mbtmp} > /dev/null [ $? -ne 0 ] && logsh "【Tools】" "文件解压失败!" && exit 1 # 安装工具箱文件 cp -rf ${mbtmp}/mixbox ${mbroot}