From 827362c678abbef94df9e5314b8457eeab9bd001 Mon Sep 17 00:00:00 2001
From: monlor <monlor@qq.com>
Date: Sun, 26 Apr 2020 09:44:29 +0800
Subject: [PATCH] 2020-04-26 09:44:29

---
 .github/workflows/{ => bak}/deploy.yaml |  0
 .github/workflows/main.yml              |  3 ++-
 apps/aria2/config/aria2.uci             |  3 ++-
 apps/mixbox/bin/applist                 |  3 ++-
 apps/mixbox/bin/base                    |  2 +-
 apps/mixbox/config/mixbox.uci           |  4 ++--
 apps/mixbox/scripts/update.sh           |  9 ++++-----
 apps/shadowsocks/config/shadowsocks.uci |  4 ++--
 apps/shadowsocks/scripts/shadowsocks.sh | 19 +++++++++--------
 tools/gitsync.sh                        | 27 +++++++++++++++++++++++--
 10 files changed, 51 insertions(+), 23 deletions(-)
 rename .github/workflows/{ => bak}/deploy.yaml (100%)

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/bak/deploy.yaml
similarity index 100%
rename from .github/workflows/deploy.yaml
rename to .github/workflows/bak/deploy.yaml
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ec7b033..224466e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -31,4 +31,5 @@ jobs:
       run: |
         git clone -b `basename ${BRANCH_NAME}` ${CO_REF}
         bash ./tools/gitsync.sh pack 
-        bash ./tools/gitsync.sh deploy mbfiles `basename ${BRANCH_NAME}` ${CO_REF}
\ No newline at end of file
+        bash ./tools/gitsync.sh deploy_lfs mbfiles `basename ${BRANCH_NAME}` ${CO_REF}
+        bash ./tools/gitsync.sh deploy mbfiles `basename ${BRANCH_NAME}` ${GH_REF}
\ No newline at end of file
diff --git a/apps/aria2/config/aria2.uci b/apps/aria2/config/aria2.uci
index a1d8abd..2256ca0 100644
--- a/apps/aria2/config/aria2.uci
+++ b/apps/aria2/config/aria2.uci
@@ -1,7 +1,8 @@
 service="Aria2"
 appname="aria2"
 needver="0.1.7"
+backupfiles="config/aria2.conf"
 supports="linux_arm,linux_mips,linux_x86_64"
 appinfo="Linux下一款高效的下载工具"
 newinfo="支持x86_64设备"
-version="0.0.6"
+version="0.0.7"
diff --git a/apps/mixbox/bin/applist b/apps/mixbox/bin/applist
index 8ddc0c8..625fa43 100644
--- a/apps/mixbox/bin/applist
+++ b/apps/mixbox/bin/applist
@@ -69,7 +69,8 @@ get_applist() {
 update_applist() {
 	
 	wgetsh ${mbtmp}/applist_tmp.txt $mburl/applist.txt
-	if [ $? -eq 0 ]; then
+	# 判断applist的内容，防止软件源异常
+	if [ $? -eq 0 ] && [ -n `cat ${mbtmp}/applist_tmp.txt | grep -E "^mixbox"` ]; then
 		rm -rf ${mbtmp}/applist.txt
 		cat ${mbtmp}/applist_tmp.txt | grep "${model}" | sort -u | while read line; do
 			local install_text=""
diff --git a/apps/mixbox/bin/base b/apps/mixbox/bin/base
index e398508..1f4b06a 100644
--- a/apps/mixbox/bin/base
+++ b/apps/mixbox/bin/base
@@ -3,7 +3,7 @@
 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/MIXBOX/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"
 mbroot=$(mbdb get mixbox.main.path)
diff --git a/apps/mixbox/config/mixbox.uci b/apps/mixbox/config/mixbox.uci
index 4f9e0a8..e84aecb 100644
--- a/apps/mixbox/config/mixbox.uci
+++ b/apps/mixbox/config/mixbox.uci
@@ -3,5 +3,5 @@ appname="mixbox"
 needver=""
 supports="linux_arm,linux_mips,linux_x86_64"
 appinfo="一款支持多平台，多架构的Shell工具箱"
-newinfo="修复base64命令段错误,升级后需要手工删除/etc/mixbox/bin/base64*"
-version="0.1.9.7"
+newinfo="修复插件列表为空的bug"
+version="0.1.9.8"
diff --git a/apps/mixbox/scripts/update.sh b/apps/mixbox/scripts/update.sh
index 6b0b96a..7c408a5 100644
--- a/apps/mixbox/scripts/update.sh
+++ b/apps/mixbox/scripts/update.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 #copyright by monlor
-[ -n "$(uci -q get monlor.tools 2> /dev/null)" ] && echo "工具箱版本过低，此更新程序已不再支持，请执行[$(uci -q get monlor.tools.path)/scripts/uninstall.sh]卸载工具箱后重新安装新的版本！" && exit 1
 source /etc/mixbox/bin/base
 
 logsh "【Tools】" "正在更新工具箱程序... "
@@ -27,15 +26,15 @@ cp -rf ${mbtmp}/mixbox/* ${mbroot}/
 
 logsh "【Tools】" "处理工具箱文件"
 # 处理工具箱二进制文件
-ln -sf  ${mbroot}/bin/base64-encode ${mbroot}/bin/base64-decode
+ln -sf ${mbroot}/bin/base64-encode ${mbroot}/bin/base64-decode
 
 logsh "【Tools】" "赋予可执行权限"
 chmod -R +x ${mbroot}/bin
 chmod -R +x ${mbroot}/scripts
 
-# 执行初始化脚本
-
-# ${mbroot}/scripts/init.sh
+# 清理工作
+logsh "【Tools】" "一点点清理工作..."
+rm -rf ${mbroot}/bin/base64*
 
 if [ -z "$(mbdb get mixbox.main.model)" ]; then
 	model=$(uname -ms | tr ' ' '_' | tr '[A-Z]' '[a-z]')
diff --git a/apps/shadowsocks/config/shadowsocks.uci b/apps/shadowsocks/config/shadowsocks.uci
index 053cc3b..73dfe99 100644
--- a/apps/shadowsocks/config/shadowsocks.uci
+++ b/apps/shadowsocks/config/shadowsocks.uci
@@ -5,5 +5,5 @@ supports="linux_arm,linux_mips,linux_x86_64"
 openport="1"
 backupfiles="config/ssserver.conf,config/sscontrol.conf,config/customize_black.conf,config/customize_white.conf"
 appinfo="最好的翻墙工具，没有之一，还可以加速国内外游戏"
-newinfo="修改obfs-local问题"
-version="0.1.5"
+newinfo="v2ray软件源失效可用"
+version="0.1.6"
diff --git a/apps/shadowsocks/scripts/shadowsocks.sh b/apps/shadowsocks/scripts/shadowsocks.sh
index abd1d99..1e01fc7 100644
--- a/apps/shadowsocks/scripts/shadowsocks.sh
+++ b/apps/shadowsocks/scripts/shadowsocks.sh
@@ -13,14 +13,17 @@ eval `mbdb export shadowsocks`
 get_v2ray_bin() {
   result1=$(curl -skL $mburl/appsbin/v2ray-bin/$model/lastest.txt) &> /dev/null
   result2=$(${mbroot}/apps/${appname}/bin/v2ray -version | head -1 | cut -d' ' -f2) &> /dev/null
-  [ -z "$result1" ] && logsh "【$service】" "获取v2ray在线版本失败，请检查网络！" && exit 1
-  logsh "【$service】" "检测v2ray版本，本地版本：$result2，在线版本：$result1"
-  if [ "$result1" != "$result2" ]; then
-    logsh "【$service】" "版本不一致，正在更新..."
-    wgetsh ${mbroot}/apps/${appname}/bin/v2ray $mburl/appsbin/v2ray-bin/$model/v2ray
-    wgetsh ${mbroot}/apps/${appname}/bin/v2ctl $mburl/appsbin/v2ray-bin/$model/v2ctl
-    chmod +x ${mbroot}/apps/${appname}/bin/v2ray
-    chmod +x ${mbroot}/apps/${appname}/bin/v2ctl
+  if [ -z "$result1" ]; then 
+    logsh "【$service】" "获取v2ray在线版本失败，请检查网络！"
+  else
+    logsh "【$service】" "检测v2ray版本，本地版本：$result2，在线版本：$result1"
+    if [ "$result1" != "$result2" ]; then
+      logsh "【$service】" "版本不一致，正在更新..."
+      wgetsh ${mbroot}/apps/${appname}/bin/v2ray $mburl/appsbin/v2ray-bin/$model/v2ray
+      wgetsh ${mbroot}/apps/${appname}/bin/v2ctl $mburl/appsbin/v2ray-bin/$model/v2ctl
+      chmod +x ${mbroot}/apps/${appname}/bin/v2ray
+      chmod +x ${mbroot}/apps/${appname}/bin/v2ctl
+    fi
   fi
 }
 
diff --git a/tools/gitsync.sh b/tools/gitsync.sh
index a3d07b3..934224d 100755
--- a/tools/gitsync.sh
+++ b/tools/gitsync.sh
@@ -70,7 +70,7 @@ pack() {
 		if [ -f ${pack_dir}/applist.txt ]; then
 			version_old=`cat ${pack_dir}/applist.txt | grep "$line|" | cut -d'|' -f4`
 			version_new=`cat apps/$line/config/$line.uci | grep "version=" | cut -d'=' -f2 | sed -e 's/"//g'`
-			[ "$version_new" = "$version_old" ] && echo "$line未更新，跳过打包..." && continue
+			[ "$version_new" != "$version_old" ] && echo "打包$line..." || continue
 		fi
 		pack_app $line
 	done
@@ -114,7 +114,7 @@ reset() {
 # $1: path to push
 # $2: remote branch name
 # $3: remote url with token
-deploy() {
+deploy_lfs() {
 
 	sed -Ei "s#mbfiles/git/raw/[a-z]+#mbfiles/git/raw/$2#" $1/install.sh
 
@@ -138,6 +138,24 @@ deploy() {
   git push "$3"
 }
 
+deploy() {
+
+	sed -Ei "s#mbfiles/git/raw/[a-z]+#mbfiles/git/raw/$2#" $1/install.sh
+
+	cd $1
+	if [ ! -d ".git" ]; then
+	  git init
+	fi
+	git config --local user.email "monlor@qq.com"
+	git config --local user.name "monlor"
+
+	if git status &> /dev/null; then
+	  git add .
+	  git commit -m "$(TZ='Asia/Shanghai' date "+%Y-%m-%d %H:%M:%S")" -a
+	fi
+  git push "$3"
+}
+
 case $1 in 
 	github)
 		github master	
@@ -156,7 +174,12 @@ case $1 in
 	reset)
 		reset master
 		;;
+	deploy_lfs)
+		shift 1
+		deploy_lfs $@
+		;;
 	deploy)
 		shift 1
 		deploy $@
+		;;
 esac