diff --git a/README.md b/README.md index ea70a75..bb589e8 100644 --- a/README.md +++ b/README.md @@ -81,6 +81,10 @@ clash -u #uninstall clash -t #test mode ``` +~**Install in Docker:**
+ +Use: https://github.com/echvoyager/shellclash_docker + ~**Additional dependencies at runtime**:
``` diff --git a/README_CN.md b/README_CN.md index 847b890..27f6bfa 100644 --- a/README_CN.md +++ b/README_CN.md @@ -84,6 +84,10 @@ clash -u #卸载脚本 clash -t #测试模式运行 ``` +~**DOCKER环境下安装:**
+ +请参考https://github.com/echvoyager/shellclash_docker + ~**运行时的额外依赖**:
`大部分的设备/系统都已经预装了以下的大部分依赖,使用时如无影响可以无视之` diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz index 96e8855..294eb28 100644 Binary files a/bin/clashfm.tar.gz and b/bin/clashfm.tar.gz differ diff --git a/scripts/clash.sh b/scripts/clash.sh index 4cf6dd0..fad1157 100644 --- a/scripts/clash.sh +++ b/scripts/clash.sh @@ -1167,9 +1167,9 @@ tools(){ echo ----------------------------------------------- echo -e " 1 ShellClash测试菜单" [ -f "/etc/firewall.user" ] && echo -e " 2 \033[32m配置\033[0m外网访问SSH" - #echo -e " 3 配置DDNS服务: \033[36m$ipv6_support\033[0m ————待施工" - [ -x /usr/sbin/otapredownload ] && echo -e " 3 \033[33m$mi_update\033[0m小米系统自动更新" + [ -f "/etc/config/ddns" -a -d "/etc/ddns" ] && echo -e " 3 配置DDNS服务(需下载相关脚本)" echo -e " 4 \033[32m流媒体预解析\033[0m————用于解决DNS解锁在TV应用上失效的问题" + [ -x /usr/sbin/otapredownload ] && echo -e " 5 \033[33m$mi_update\033[0m小米系统自动更新" echo ----------------------------------------------- echo -e " 0 返回上级菜单 \033[0m" echo ----------------------------------------------- @@ -1187,7 +1187,24 @@ tools(){ sleep 1 tools - elif [ -x /usr/sbin/otapredownload ] && [ "$num" = 3 ]; then + elif [ "$num" = 3 ]; then + echo ----------------------------------------------- + if [ ! -f $clashdir/ShellDDNS.sh ];then + echo -e "正在获取在线脚本……" + $clashdir/start.sh webget /tmp/ShellDDNS.sh $update_url/tools/ShellDDNS.sh + if [ "$?" = "0" ];then + mv -f /tmp/ShellDDNS.sh $clashdir/ShellDDNS.sh + source $clashdir/ShellDDNS.sh + else + echo -e "\033[31m文件下载失败!\033[0m" + fi + else + source $clashdir/ShellDDNS.sh + fi + sleep 1 + tools + + elif [ -x /usr/sbin/otapredownload ] && [ "$num" = 5 ]; then [ "$mi_update" = "禁用" ] && sed -i "/otapredownload/d" /etc/crontabs/root || echo "15 3,4,5 * * * /usr/sbin/otapredownload >/dev/null 2>&1" >> /etc/crontabs/root echo ----------------------------------------------- echo -e "已\033[33m$mi_update\033[0m小米路由器的自动启动,如未生效,请在官方APP中同步设置!" diff --git a/tools/ShellDDNS.sh b/tools/ShellDDNS.sh index 78c6190..5649cf3 100644 --- a/tools/ShellDDNS.sh +++ b/tools/ShellDDNS.sh @@ -4,7 +4,7 @@ ddns_dir=/etc/config/ddns tmp_dir=/tmp/ddns_$USER -[ ! -f "$ddns_dir" -o ! -d "/etc/ddns"] && echo -e "本脚本依赖OpenWrt内置的DDNS服务,当前设备无法运行,已退出!" && exit 1 +[ ! -f "$ddns_dir" -o ! -d "/etc/ddns" ] && echo -e "本脚本依赖OpenWrt内置的DDNS服务,当前设备无法运行,已退出!" && exit 1 echo ----------------------------------------------- echo -e "\033[30;46m欢迎使用ShellDDNS!\033[0m" echo -e "TG群:\033[36;4mhttps://t.me/clashfm\033[0m"