2020-03-06 17:14:26

.github/workflows/main.yml

@@ -7,13 +7,6 @@ on:
       - master
       - test
       - dev
-    tags-ignore:
-      - deploy-*
-      - test-*
-      - master-*
-    ignore-paths:
-      - '.github'
-      - 'README.md'
   pull_request:
     branchs:  
       - master

apps/mixbox/config/mixbox.uci

@@ -3,5 +3,5 @@ appname="mixbox"
 needver=""
 supports="linux_arm,linux_mips,linux_x86_64"
 appinfo="一款支持多平台，多架构的Shell工具箱"
-newinfo="新增base64_encode工具"
+newinfo="修复插件安装失败的bug"
-version="0.1.9.2"
+version="0.1.9.3"

apps/mixbox/scripts/helper.sh

@@ -13,10 +13,10 @@ wgetsh() {
 		result1=$(curl -skL --connect-timeout 10 -m 20 -w %{http_code} -o "${mbtmp}/${wgetfilename}" "$wgeturl")
 	else
 		wget-ssl -q --no-check-certificate --tries=1 --timeout=10 -O "${mbtmp}/${wgetfilename}" "$wgeturl"
-		[ $? -eq 0 ] && result="200"
+		[ $? -eq 0 ] && result1="200"
 	fi
 	[ -f "${mbtmp}/${wgetfilename}" ] && result2=$(du -sh "${mbtmp}/${wgetfilename}" 2> /dev/null | awk '{print$1}')
-	if [ "$result" = "200" ] && [ "$result2" != '0' ]; then
+	if [ "$result1" = "200" ] && [ "$result2" != '0' ]; then
 		chmod +x ${mbtmp}/${wgetfilename} > /dev/null 2>&1
 		mv -f ${mbtmp}/${wgetfilename} $wgetfilepath > /dev/null 2>&1
 		return 0

install.sh

@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #copyright by monlor
-  
+   
 clear
 logsh() {
 	# 输出信息到/tmp/messages和标准输出

tools/gitsync.sh

@@ -76,15 +76,12 @@ pack() {
 	done
 	gerneral_applist
 
-	if [ ! -d ${pack_dir} ]; then
+	test ! -d ${pack_dir}/appstore && mkdir -p ${pack_dir}/appstore
-		mkdir -p ${pack_dir}
+	test ! -d ${pack_dir}/temp && mkdir -p ${pack_dir}/temp
-		mkdir -p ${pack_dir}/appstore
+	test ! -d ${pack_dir}/appsbin && mkdir -p ${pack_dir}/appsbin
-		mkdir -p ${pack_dir}/temp
-		mkdir -p ${pack_dir}/appsbin
-	fi
 	
-	cp -rf appsbin/* ${pack_dir}/
+	cp -rf appsbin/* ${pack_dir}/appsbin/
-  cp -rf temp/* ${pack_dir}/
+  cp -rf temp/* ${pack_dir}/temp/
   cp -rf install.sh ${pack_dir}/
   mv -f appstore/* ${pack_dir}/appstore/
   mv -f applist.txt ${pack_dir}/
@@ -137,7 +134,7 @@ deploy() {
 	  git add .
 	  git commit -m "$(TZ='Asia/Shanghai' date "+%Y-%m-%d %H:%M:%S")" -a
 	fi
-	# git lfs push "$3" --all
+	git lfs push "$3" --all
   git push "$3"
 }