diff --git a/applist.txt b/applist.txt index c0f9264..649c337 100644 --- a/applist.txt +++ b/applist.txt @@ -12,10 +12,10 @@ frps|内网穿透工具Frp服务端|frp程序更新到0.21.0|0.0.2|Frps|linux_ar httpfile|搭建简单的web文件浏览页面||0.0.2|HttpFile|linux_arm,linux_mips,linux_x86_64 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环境||0.0.2|KodExplorer|linux_arm,linux_mips,linux_x86_64 +kodexplorer|可道云,在线文档管理器,需要entware环境|修复脚本bug,无法启用程序|0.0.3|KodExplorer|linux_arm,linux_mips,linux_x86_64 koolproxy|简单,快速屏蔽网页或视频广告|去掉openssl程序,采用kp自带程序生成证书,减小插件体积|0.0.2|KoolProxy|linux_arm,linux_mips,linux_x86_64 miwifi|小米路由器系统管理,修改samba禁用系统更新等||0.0.3|MIWIFI|linux_arm,linux_mips -mixbox|一款支持多平台,多架构的Shell工具箱|全新版本会尝试支持更多的平台,但还需要一点时间!|0.0.5|MIXBOX|linux_arm,linux_mips,linux_x86_64,darwin_x86_64 +mixbox|一款支持多平台,多架构的Shell工具箱|修复由于mbdb导致frpc配置无法识别的bug|0.0.6|MIXBOX|linux_arm,linux_mips,linux_x86_64,darwin_x86_64 ngrok|轻量级的内网穿透工具||0.0.2|Ngrok|linux_arm,linux_mips pptpd|简单但并不安全的VPN服务器||0.0.2|PPTPD|linux_arm,linux_mips,linux_x86_64 qiandao|koolshare merlin 自动签到程序||0.0.2|QianDao|linux_arm,linux_x86_64 diff --git a/apps/kodexplorer/config/kodexplorer.uci b/apps/kodexplorer/config/kodexplorer.uci index 5ca8b63..135e453 100644 --- a/apps/kodexplorer/config/kodexplorer.uci +++ b/apps/kodexplorer/config/kodexplorer.uci @@ -3,5 +3,5 @@ appname="kodexplorer" needver="0.0.1" supports="linux_arm,linux_mips,linux_x86_64" appinfo="可道云,在线文档管理器,需要entware环境" -newinfo="" -version="0.0.2" +newinfo="修复脚本bug,无法启用程序" +version="0.0.3" diff --git a/apps/kodexplorer/config/mixbox.conf b/apps/kodexplorer/config/mixbox.conf index b40ebe5..e5438b1 100644 --- a/apps/kodexplorer/config/mixbox.conf +++ b/apps/kodexplorer/config/mixbox.conf @@ -14,7 +14,7 @@ kodexplorer() { read -p "请输入${appname}端口号(默认81):" res [ ! -z $res ] && mbdb set $appname.main.port="$res" || mbdb set $appname.main.port=81 fi - readsh "请输入${appname}管理目录" "path" "mbdisk/data" + readsh "请输入${appname}管理目录" "path" "$mbdisk" readsh "请输入${appname}外网访问配置[1/0]" "openport" "1" ${mbroot}/apps/${appname}/scripts/${appname}.sh restart diff --git a/apps/kodexplorer/scripts/kodexplorer.sh b/apps/kodexplorer/scripts/kodexplorer.sh index bb1fff4..d25b182 100644 --- a/apps/kodexplorer/scripts/kodexplorer.sh +++ b/apps/kodexplorer/scripts/kodexplorer.sh @@ -86,8 +86,8 @@ config_nginx() { } EOF sed -i "s/81/${port}/" ${mbtmp}/${appname}.conf - rm -rf ${mbroot}/apps/${appname}/config - ln -s ${mbtmp}/${appname}.conf ${mbroot}/apps/${appname}/config + rm -rf /opt/etc/nginx/vhost/${appname}.conf + ln -s ${mbtmp}/${appname}.conf /opt/etc/nginx/vhost/${appname}.conf } detect_webfiles() { @@ -124,7 +124,7 @@ mount_admin_root() { start () { result=$(ps | grep -E 'nginx|php-cgi' | grep -v sysa | grep -v grep | wc -l) - if [ "$result" != '0' ] && [ -f "${mbroot}/apps/${appname}/config" ];then + if [ "$result" != '0' ];then logsh "【$service】" "${appname}已经在运行!" exit 1 fi @@ -180,7 +180,7 @@ stop () { logsh "【$service】" "正在停止${appname}服务... " [ "$enable" == '0' ] && destroy result=$(mbdb get mixbox.httpfile.enable) - killall php-cgi > /dev/null + killall php-cgi &> /dev/null # kill -9 $(ps | grep 'nginx' | grep -v sysa | grep -v grep | awk '{print$1}') > /dev/null 2>&1 close_port remove_firewall_start @@ -188,7 +188,7 @@ stop () { logsh "【$service】" "关闭或卸载不会删除opkg的软件包和${appname}的web文件!" umountsh $PHPCONF && rm -rf ${mbtmp}/php.ini umountsh $NGINXCONF && rm -rf ${mbtmp}/nginx.conf - rm -rf ${mbtmp}/${appname}.conf ${mbroot}/apps/${appname}/config + rm -rf ${mbtmp}/${appname}.conf umountsh $WWW/data/User/admin/home } @@ -209,7 +209,7 @@ destroy() { status() { result=$(pssh | grep -E 'nginx|php-cgi' | grep -v sysa | grep -v grep | wc -l) - if [ "$result" -ge '5' ] && [ -f "${mbroot}/apps/${appname}/config" ]; then + if [ "$result" -ge '5' ] && [ -f "/opt/etc/nginx/vhost/${appname}.conf" ]; then status="运行端口号: ${port}, 管理目录: $path|1" else status="未运行|0" diff --git a/apps/mixbox/bin/mbdb b/apps/mixbox/bin/mbdb index f0ea94b..0b3c13b 100644 --- a/apps/mixbox/bin/mbdb +++ b/apps/mixbox/bin/mbdb @@ -35,9 +35,9 @@ case "$method" in ;; show) if [ -z "${uciname}" ]; then - uci -q show ${appname} + uci -q show ${appname} | sed -e "/${appname}.[a-z]\+\=config/d" -e 's/mixbox\.[a-z]\+\.//' else - uci -q get ${appname}.${uciname} &> /dev/null && uci -q show ${appname}.${uciname} + uci -q get ${appname}.${uciname} &> /dev/null && uci -q show ${appname}.${uciname} | sed -e "/${appname}.[a-z]\+\=config/d" -e 's/mixbox\.[a-z]\+\.//' fi ;; clear) diff --git a/apps/mixbox/config/mixbox.uci b/apps/mixbox/config/mixbox.uci index e287aa9..b47f362 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,darwin_x86_64" appinfo="一款支持多平台,多架构的Shell工具箱" -newinfo="全新版本会尝试支持更多的平台,但还需要一点时间!" -version="0.0.5" +newinfo="修复由于mbdb导致frpc配置无法识别的bug" +version="0.0.6" diff --git a/appstore/history/kodexplorer_linux_arm.tar.gz b/appstore/history/kodexplorer_linux_arm.tar.gz index 4689322..0d073b2 100644 Binary files a/appstore/history/kodexplorer_linux_arm.tar.gz and b/appstore/history/kodexplorer_linux_arm.tar.gz differ diff --git a/appstore/history/kodexplorer_linux_mips.tar.gz b/appstore/history/kodexplorer_linux_mips.tar.gz index 4689322..0d073b2 100644 Binary files a/appstore/history/kodexplorer_linux_mips.tar.gz and b/appstore/history/kodexplorer_linux_mips.tar.gz differ diff --git a/appstore/history/kodexplorer_linux_x86_64.tar.gz b/appstore/history/kodexplorer_linux_x86_64.tar.gz index 4689322..0d073b2 100644 Binary files a/appstore/history/kodexplorer_linux_x86_64.tar.gz and b/appstore/history/kodexplorer_linux_x86_64.tar.gz differ diff --git a/appstore/history/mixbox_darwin_x86_64.tar.gz b/appstore/history/mixbox_darwin_x86_64.tar.gz index 43c5734..8776ec2 100644 Binary files a/appstore/history/mixbox_darwin_x86_64.tar.gz and b/appstore/history/mixbox_darwin_x86_64.tar.gz differ diff --git a/appstore/history/mixbox_linux_arm.tar.gz b/appstore/history/mixbox_linux_arm.tar.gz index 4bb79ea..b4d70e3 100644 Binary files a/appstore/history/mixbox_linux_arm.tar.gz and b/appstore/history/mixbox_linux_arm.tar.gz differ diff --git a/appstore/history/mixbox_linux_mips.tar.gz b/appstore/history/mixbox_linux_mips.tar.gz index a495e14..519a1b6 100644 Binary files a/appstore/history/mixbox_linux_mips.tar.gz and b/appstore/history/mixbox_linux_mips.tar.gz differ diff --git a/appstore/history/mixbox_linux_x86_64.tar.gz b/appstore/history/mixbox_linux_x86_64.tar.gz index 6d83d97..f6a28ce 100644 Binary files a/appstore/history/mixbox_linux_x86_64.tar.gz and b/appstore/history/mixbox_linux_x86_64.tar.gz differ diff --git a/appstore/kodexplorer_linux_arm.tar.gz b/appstore/kodexplorer_linux_arm.tar.gz index 9d1e2ae..4b03f36 100644 Binary files a/appstore/kodexplorer_linux_arm.tar.gz and b/appstore/kodexplorer_linux_arm.tar.gz differ diff --git a/appstore/kodexplorer_linux_mips.tar.gz b/appstore/kodexplorer_linux_mips.tar.gz index 9d1e2ae..4b03f36 100644 Binary files a/appstore/kodexplorer_linux_mips.tar.gz and b/appstore/kodexplorer_linux_mips.tar.gz differ diff --git a/appstore/kodexplorer_linux_x86_64.tar.gz b/appstore/kodexplorer_linux_x86_64.tar.gz index 9d1e2ae..4b03f36 100644 Binary files a/appstore/kodexplorer_linux_x86_64.tar.gz and b/appstore/kodexplorer_linux_x86_64.tar.gz differ diff --git a/appstore/mixbox_darwin_x86_64.tar.gz b/appstore/mixbox_darwin_x86_64.tar.gz index 70d80ab..d6cd209 100644 Binary files a/appstore/mixbox_darwin_x86_64.tar.gz and b/appstore/mixbox_darwin_x86_64.tar.gz differ diff --git a/appstore/mixbox_linux_arm.tar.gz b/appstore/mixbox_linux_arm.tar.gz index e79194a..bdcb72c 100644 Binary files a/appstore/mixbox_linux_arm.tar.gz and b/appstore/mixbox_linux_arm.tar.gz differ diff --git a/appstore/mixbox_linux_mips.tar.gz b/appstore/mixbox_linux_mips.tar.gz index 01573de..73f7dbc 100644 Binary files a/appstore/mixbox_linux_mips.tar.gz and b/appstore/mixbox_linux_mips.tar.gz differ diff --git a/appstore/mixbox_linux_x86_64.tar.gz b/appstore/mixbox_linux_x86_64.tar.gz index 4deacd8..d902d2f 100644 Binary files a/appstore/mixbox_linux_x86_64.tar.gz and b/appstore/mixbox_linux_x86_64.tar.gz differ diff --git a/install.sh b/install.sh index 1178c36..5694436 100644 --- a/install.sh +++ b/install.sh @@ -40,8 +40,8 @@ if [ -n "$(echo "$mbdisk" | grep -E "^[0-9][0-9]*$")" ]; then fi if [ -d "${mbroot}" -o -d /etc/mixbox -o -L /etc/mixbox ]; then - logsh "【Tools】" "工具箱已安装,请卸载后重新安装!" - exit 1 + read -p "工具箱已安装,清除并继续?[1/0] " res + [ "$res" = '1' ] && rm -rf /etc/mixbox || exit 1 fi logsh "【Tools】" "下载工具箱文件..."