2020-03-03

README.md

@@ -8,6 +8,10 @@
 
 ### 更新日志
 
+* 2020-03-03
+	* 更新工具箱coding下载源，**请手动更换coding下载源：https://monlor.coding.net/p/MIXBOX/d/MIXBOX/git/raw/master**
+	* 更新插件`Koolproxy`规则地址
+
 * 2020-02-27
 	* 新增插件npc，待测试
 	* aria2版本更新

applist.txt

@@ -13,9 +13,9 @@ httpfile|搭建简单的web文件浏览页面||0.0.2|HttpFile|linux_arm,linux_mi
 jetbrains|快速搭建JetBrains激活服务器||0.0.2|JetBrains|linux_arm,linux_mips,linux_x86_64,darwin_x86_64
 kms|快速搭建Windows、Office激活服务器|Support for Windows 10 1809, Windows Server 2019 and Office 2019 built-in|0.0.2|Kms|linux_arm,linux_mips,linux_x86_64,darwin_x86_64
 kodexplorer|可道云，在线文档管理器，需要entware环境|修复unzip命令缺失|0.0.4|KodExplorer|linux_arm,linux_mips,linux_x86_64
-koolproxy|简单，快速屏蔽网页或视频广告|去掉openssl程序，采用kp自带程序生成证书，减小插件体积|0.0.2|KoolProxy|linux_arm,linux_mips,linux_x86_64
+koolproxy|简单，快速屏蔽网页或视频广告，TG：https://t.me/joinchat/AAAAAD-tO7GPvfOU131_vg|修改为coding规则地址，由于coding连接数限制可能导致规则下载失败！|1.5.2|KoolProxy|linux_arm,linux_mips,linux_x86_64
 miwifi|小米路由器系统管理，修改samba禁用系统更新等|现在修复小米路由器远程访问会自动开放8098端口|0.0.4|MIWIFI|linux_arm,linux_mips
-mixbox|一款支持多平台，多架构的Shell工具箱|修复由于mbdb导致frpc配置无法识别的bug|0.0.6|MIXBOX|linux_arm,linux_mips,linux_x86_64,darwin_x86_64
+mixbox|一款支持多平台，多架构的Shell工具箱|修复由于mbdb导致frpc配置无法识别的bug|0.0.7|MIXBOX|linux_arm,linux_mips,linux_x86_64,darwin_x86_64
 ngrok|轻量级的内网穿透工具||0.0.2|Ngrok|linux_arm,linux_mips
 npc|一款轻量级、高性能、功能强大的内网穿透代理服务器||0.0.2|NPC|linux_arm,linux_mips
 pptpd|简单但并不安全的VPN服务器||0.0.2|PPTPD|linux_arm,linux_mips,linux_x86_64

apps/koolproxy/config/koolproxy.uci

@@ -4,6 +4,6 @@ needver="0.0.1"
 supports="linux_arm,linux_mips,linux_x86_64"
 openport="1"
 backupfiles="config/kpcontrol.conf,bin/data/private,bin/data/certs"
-newinfo="去掉openssl程序，采用kp自带程序生成证书，减小插件体积"
-appinfo="简单，快速屏蔽网页或视频广告"
-version="0.0.2"
+newinfo="修改为coding规则地址，由于coding连接数限制可能导致规则下载失败！"
+appinfo="简单，快速屏蔽网页或视频广告，TG：https://t.me/joinchat/AAAAAD-tO7GPvfOU131_vg"
+version="1.5.2"

apps/koolproxy/config/version.txt

@@ -1 +0,0 @@
-1.5.1

apps/koolproxy/scripts/koolproxy.sh

@@ -16,9 +16,9 @@ start_koolproxy () {
     if [ "$mode" == "1" ]; then
         logsh "【$service】" "启动${appname}为全局模式！"
         cat > ${mbroot}/apps/${appname}/bin/data/source.list <<-EOF
-1|koolproxy.txt|https://kprule.com/koolproxy.txt|
-1|daily.txt|https://kprule.com/daily.txt|
-1|kp.dat|https://kprule.com/kp.dat|
+1|koolproxy.txt|https://houzi-.coding.net/p/my_dream/d/my_dream/git/raw/master/koolproxy.txt|
+1|daily.txt|https://houzi-.coding.net/p/my_dream/d/my_dream/git/raw/master/daily.txt|
+1|kp.dat|https://houzi-.coding.net/p/my_dream/d/my_dream/git/raw/master/kp.dat|
 1|user.txt||
 EOF
     fi
@@ -26,9 +26,9 @@ EOF
     if [ "$mode" == "2" ]; then
         logsh "【$service】" "启动${appname}为黑名单模式！"
         cat > ${mbroot}/apps/${appname}/bin/data/source.list <<-EOF
-1|koolproxy.txt|https://kprule.com/koolproxy.txt|
-1|daily.txt|https://kprule.com/daily.txt|
-1|kp.dat|https://kprule.com/kp.dat|
+1|koolproxy.txt|https://houzi-.coding.net/p/my_dream/d/my_dream/git/raw/master/koolproxy.txt|
+1|daily.txt|https://houzi-.coding.net/p/my_dream/d/my_dream/git/raw/master/daily.txt|
+1|kp.dat|https://houzi-.coding.net/p/my_dream/d/my_dream/git/raw/master/kp.dat|
 1|user.txt||
 EOF
     fi
@@ -36,7 +36,7 @@ EOF
     if [ "$mode" == "3" ]; then
         logsh "【$service】" "启动${appname}为视频模式！"
         cat > ${mbroot}/apps/${appname}/bin/data/source.list <<-EOF
-1|kp.dat|https://kprule.com/kp.dat|
+1|kp.dat|https://houzi-.coding.net/p/my_dream/d/my_dream/git/raw/master/kp.dat|
 1|user.txt||
 EOF
     fi

apps/mixbox/config/mixbox.uci

@@ -4,4 +4,4 @@ needver=""
 supports="linux_arm,linux_mips,linux_x86_64,darwin_x86_64"
 appinfo="一款支持多平台，多架构的Shell工具箱"
 newinfo="修复由于mbdb导致frpc配置无法识别的bug"
-version="0.0.6"
+version="0.0.7"

install.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 #copyright by monlor
 
 clear

tools/gitsync.sh

@@ -16,15 +16,15 @@ sedsh() {
 	[ -z "$1" -o -z "$2" -o -z "$3" ] && echo "null sedsh params!" && exit 1
 	if [ "$(uname -s)" = "Darwin" ]; then
 		if [ "$1" = "s" ]; then
-			sed -i "" "s#$2#$3#g" "$4"
+			sed -i "" "s/$2/$3/g" "$4"
 		elif [[ "$1" = "d" ]]; then
-			sed -i "" "#$2#d" "$3"
+			sed -i "" "/$2/d" "$3"
 		fi
 	else
 		if [[ "$1" = "s" ]]; then
-			sed -i "s#$2#$3#g" "$4"
+			sed -i "s/$2/$3/g" "$4"
 		elif [[ "$1" = "d" ]]; then
-			sed -i "#$2#d" "$3"
+			sed -i "/$2/d" "$3"
 		fi
 	fi
 }