diff --git a/README_CN.md b/README_CN.md
index 38706cb..b48e714 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -56,7 +56,7 @@ export url='https://fastly.jsdelivr.net/gh/juewuy/ShellClash@master' && wget -q
或者
```shell
sudo -i #切换到root用户，如果需要密码，请输入密码
-export url='https://gh.shellclash.cf/master' && bash -c "$(curl -kfsSl $url/install.sh)" && source /etc/profile &> /dev/null
+export url='https://gh.jwsc.eu.org/master' && bash -c "$(curl -kfsSl $url/install.sh)" && source /etc/profile &> /dev/null
```
~**路由设备使用curl安装**：
@@ -73,7 +73,7 @@ export url='https://fastly.jsdelivr.net/gh/juewuy/ShellClash@master' && sh -c "$
或者
```shell
#作者私人源
-export url='https://gh.shellclash.cf/master' && sh -c "$(curl -kfsSl $url/install.sh)" && source /etc/profile &> /dev/null
+export url='https://gh.jwsc.eu.org/master' && sh -c "$(curl -kfsSl $url/install.sh)" && source /etc/profile &> /dev/null
```
~**路由设备使用wget安装**：
@@ -92,7 +92,7 @@ export url='https://fastly.jsdelivr.net/gh/juewuy/ShellClash@master' && wget -q
```Shell
#作者私人http内测源
-export url='http://test.shellclash.cf' && wget -q -O /tmp/install.sh $url/install.sh && sh /tmp/install.sh && source /etc/profile &> /dev/null
+export url='http://t.jwsc.eu.org' && wget -q -O /tmp/install.sh $url/install.sh && sh /tmp/install.sh && source /etc/profile &> /dev/null
```
~**DOCKER环境下安装：**
diff --git a/bin/ShellClash.tar.gz b/bin/ShellClash.tar.gz
index 719270b..094c423 100644
Binary files a/bin/ShellClash.tar.gz and b/bin/ShellClash.tar.gz differ
diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz
index 1b6c675..43e85ab 100644
Binary files a/bin/clashfm.tar.gz and b/bin/clashfm.tar.gz differ
diff --git a/bin/version b/bin/version
index 59db16e..5477f08 100644
--- a/bin/version
+++ b/bin/version
@@ -2,5 +2,5 @@ clashnet_v=v1.7.6
clashpre_v=2022.11.25
clash_v=v1.7.1
meta_v=v1.13.2
-versionsh=1.7.0b
GeoIP_v=20230128
+versionsh=1.7.0d
diff --git a/install.sh b/install.sh
index 8415b73..3ef82b2 100644
--- a/install.sh
+++ b/install.sh
@@ -62,7 +62,7 @@ gettar(){
error_down
exit 1
else
- source $clashdir/init.sh 2>/dev/null
+ source $clashdir/init.sh >/dev/null
fi
fi
}
diff --git a/scripts/clash.sh b/scripts/clash.sh
index 1231c4d..1623d23 100644
--- a/scripts/clash.sh
+++ b/scripts/clash.sh
@@ -98,8 +98,9 @@ ckstatus(){
#检查执行权限
[ ! -x $clashdir/start.sh ] && chmod +x $clashdir/start.sh
#检查/tmp内核文件
- [ -f /tmp/clash*linux* ] && chmod +x /tmp/clash*linux* && {
- tmp_version=$(/tmp/clash*linux* -v)
+ for file in /tmp/clash*linux* ; do
+ chmod +x $file
+ tmp_version=$($file -v)
if [ -n "$tmp_version" ];then
echo -e "\033[32m发现可用的内核文件\033[0m"
read -p "是否加载？(1/0) > " res
@@ -113,27 +114,29 @@ ckstatus(){
3) clashcore=clash.meta ;;
*) clashcore=clash ;;
esac
- mv -f /tmp/clash*linux* $bindir/clash
+ mv -f $file $bindir/clash
setconfig clashcore $clashcore
}
else
echo -e "\033[33m检测到不可用的内核文件！可能是文件受损或CPU架构不匹配！\033[0m"
- rm -rf /tmp/clash*linux*
+ rm -rf $file
echo -e "\033[33m内核文件已移除，请认真检查后重新上传！\033[0m"
- sleep 3
+ sleep 2
fi
echo -----------------------------------------------
- }
+ done
#检查/tmp配置文件
- [ -f /tmp/*.*ml -a -x $bindir/clash ] && $bindir/clash -t -d $bindir -f /tmp/*.*ml &>/dev/null && {
+ [ -x $bindir/clash ] && \
+ for file in /tmp/clash*linux* ; do
+ $bindir/clash -t -d $bindir -f $file &>/dev/null && {
echo -e "\033[32m发现可用的YAML配置文件\033[0m"
- echo /tmp/*.*ml
+ echo $file
read -p "是否加载为config.yaml配置文件？(1/0) > " res
[ "$res" = 1 ] && {
- mv -f /tmp/*.*ml $clashdir/config.yaml
+ mv -f $file $clashdir/config.yaml
}
echo -----------------------------------------------
- }
+ done
}
#启动相关
@@ -669,7 +672,7 @@ macfilter(){
echo -e "\033[31m已添加的设备，请勿重复添加！\033[0m"
fi
add_mac
- elif [ $num -le $(cat $dhcpdir | awk 'END{print NR}') 2>/dev/null ]; then
+ elif [ $num -le $(cat $dhcpdir 2>/dev/null | awk 'END{print NR}') ]; then
macadd=$(cat $dhcpdir | awk '{print $2}' | sed -n "$num"p)
if [ -z "$(cat $clashdir/mac | grep -E "$macadd")" ];then
echo $macadd >> $clashdir/mac
@@ -1039,6 +1042,10 @@ clashcfg(){
set_redir_config
elif [ "$num" = 2 ]; then
+ modprobe tun &>/dev/null || {
+ echo -e "\033[32m设备未检测到Tun模块，可能无法代理UDP流量！\033[0m"
+ sleep 1
+ }
redir_mod=混合模式
set_redir_config
diff --git a/scripts/getdate.sh b/scripts/getdate.sh
index 36f90bd..49c3d03 100644
--- a/scripts/getdate.sh
+++ b/scripts/getdate.sh
@@ -758,7 +758,7 @@ setserver(){
release_url=''
saveserver
elif [ "$num" = 4 ]; then
- update_url='https://gh.shellclash.cf/master'
+ update_url='https://gh.jwsc.eu.org/master'
release_url=''
saveserver
elif [ "$num" = 5 ]; then
@@ -770,7 +770,7 @@ setserver(){
release_url=''
saveserver
elif [ "$num" = 7 ]; then
- update_url='http://test.shellclash.cf'
+ update_url='http://t.jwsc.eu.org'
release_url=''
saveserver
elif [ "$num" = 8 ]; then
@@ -793,7 +793,7 @@ setserver(){
read -p "请输入对应数字 > " num
if [ -z "$num" -o "$num" = 0 ]; then
setserver
- elif [ $num -le $(cat /tmp/clashrelease | awk 'END{print NR}') 2>/dev/null ]; then
+ elif [ $num -le $(cat /tmp/clashrelease 2>/dev/null | awk 'END{print NR}') ]; then
release_version=$(cat /tmp/clashrelease | awk '{print $1}' | sed -n "$num"p)
update_url="https://raw.githubusercontent.com/juewuy/ShellClash/$release_version"
saveserver
diff --git a/scripts/init.sh b/scripts/init.sh
index f671125..eae32ab 100644
--- a/scripts/init.sh
+++ b/scripts/init.sh
@@ -1,7 +1,7 @@
- #!/bin/sh
+#!/bin/sh
# Copyright (C) Juewuy
-version=1.7.0b
+version=1.7.0d
setdir(){
dir_avail(){
diff --git a/scripts/start.sh b/scripts/start.sh
index 6c18bbc..4f076e8 100644
--- a/scripts/start.sh
+++ b/scripts/start.sh
@@ -155,7 +155,7 @@ https://api.v1.mk
https://sub.xeton.dev
https://v.id9.cc
https://sub.maoxiongnet.com
-http://sub2.shellclash.cf
+http://sub2.jwsc.eu.org
EOF`
Config=`sed -n ""$rule_link"p"<