diff --git a/bin/Country.mmdb b/bin/Country.mmdb index e3ed4c73..49b103c5 100644 Binary files a/bin/Country.mmdb and b/bin/Country.mmdb differ diff --git a/bin/clash/clash-linux-386 b/bin/clash/clash-linux-386 index 841de611..e8a04a15 100644 Binary files a/bin/clash/clash-linux-386 and b/bin/clash/clash-linux-386 differ diff --git a/bin/clash/clash-linux-amd64 b/bin/clash/clash-linux-amd64 index d00a62f4..2c4e077d 100644 Binary files a/bin/clash/clash-linux-amd64 and b/bin/clash/clash-linux-amd64 differ diff --git a/bin/clash/clash-linux-armv5 b/bin/clash/clash-linux-armv5 index 67973bd7..749ea202 100644 Binary files a/bin/clash/clash-linux-armv5 and b/bin/clash/clash-linux-armv5 differ diff --git a/bin/clash/clash-linux-armv7 b/bin/clash/clash-linux-armv7 index 23c9e64e..f526e645 100644 Binary files a/bin/clash/clash-linux-armv7 and b/bin/clash/clash-linux-armv7 differ diff --git a/bin/clash/clash-linux-armv8 b/bin/clash/clash-linux-armv8 index 3c3eb839..3c87cf89 100644 Binary files a/bin/clash/clash-linux-armv8 and b/bin/clash/clash-linux-armv8 differ diff --git a/bin/clash/clash-linux-mipsle-hardfloat b/bin/clash/clash-linux-mipsle-hardfloat index e4a8bde5..40ac2033 100644 Binary files a/bin/clash/clash-linux-mipsle-hardfloat and b/bin/clash/clash-linux-mipsle-hardfloat differ diff --git a/bin/clash/clash-linux-mipsle-softfloat b/bin/clash/clash-linux-mipsle-softfloat index 4b6b6bf0..530f0144 100644 Binary files a/bin/clash/clash-linux-mipsle-softfloat and b/bin/clash/clash-linux-mipsle-softfloat differ diff --git a/bin/clash/version b/bin/clash/version deleted file mode 100644 index de652dbc..00000000 --- a/bin/clash/version +++ /dev/null @@ -1 +0,0 @@ -version=1.1.0 diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz index 04bc2ba2..5635162e 100644 Binary files a/bin/clashfm.tar.gz and b/bin/clashfm.tar.gz differ diff --git a/bin/clashpre/clash-linux-386 b/bin/clashpre/clash-linux-386 index ee516434..952e3ed4 100644 Binary files a/bin/clashpre/clash-linux-386 and b/bin/clashpre/clash-linux-386 differ diff --git a/bin/clashpre/clash-linux-amd64 b/bin/clashpre/clash-linux-amd64 index 5e5837fc..8094f5a4 100644 Binary files a/bin/clashpre/clash-linux-amd64 and b/bin/clashpre/clash-linux-amd64 differ diff --git a/bin/clashpre/clash-linux-armv5 b/bin/clashpre/clash-linux-armv5 index 3f66610a..f531a719 100644 Binary files a/bin/clashpre/clash-linux-armv5 and b/bin/clashpre/clash-linux-armv5 differ diff --git a/bin/clashpre/clash-linux-armv7 b/bin/clashpre/clash-linux-armv7 index 330d3a61..d7322ed7 100644 Binary files a/bin/clashpre/clash-linux-armv7 and b/bin/clashpre/clash-linux-armv7 differ diff --git a/bin/clashpre/clash-linux-armv8 b/bin/clashpre/clash-linux-armv8 index 030867f8..0785b4df 100644 Binary files a/bin/clashpre/clash-linux-armv8 and b/bin/clashpre/clash-linux-armv8 differ diff --git a/bin/clashpre/clash-linux-mipsle-hardfloat b/bin/clashpre/clash-linux-mipsle-hardfloat index a32c6a3d..55a0b856 100644 Binary files a/bin/clashpre/clash-linux-mipsle-hardfloat and b/bin/clashpre/clash-linux-mipsle-hardfloat differ diff --git a/bin/clashpre/clash-linux-mipsle-softfloat b/bin/clashpre/clash-linux-mipsle-softfloat index 13844beb..021a955b 100644 Binary files a/bin/clashpre/clash-linux-mipsle-softfloat and b/bin/clashpre/clash-linux-mipsle-softfloat differ diff --git a/bin/clashpre/version b/bin/clashpre/version deleted file mode 100644 index a28162f3..00000000 --- a/bin/clashpre/version +++ /dev/null @@ -1 +0,0 @@ -version=2020.09.27 diff --git a/bin/version b/bin/version index ca45d173..861fce11 100644 --- a/bin/version +++ b/bin/version @@ -1,4 +1,4 @@ -GeoIP_v=20201001 -clash_v=1.1.0 -clashpre_v=2020.09.27 -versionsh=1.0.0beta13fix2 +clash_v=1.2.0 +clashpre_v=2020.10.09 +versionsh=1.0.0beta14 +GeoIP_v=20201010 diff --git a/install.sh b/install.sh index 89dc2113..54d1e4f6 100644 --- a/install.sh +++ b/install.sh @@ -39,7 +39,7 @@ gettar(){ mv $clashdir/clashservice /etc/init.d/clash chmod 777 /etc/init.d/clash else - [ -d /etc/systemd/system ] && sysdir=/etc/systemd/system + [ -d /etc/systemd/system/ ] && sysdir=/etc/systemd/system/ [ -d /usr/lib/systemd/system/ ] && sysdir=/usr/lib/systemd/system/ if [ -n "$sysdir" ];then #设为systemd方式启动 diff --git a/install_test.sh b/install_test.sh index 89dc2113..fa43a40e 100644 --- a/install_test.sh +++ b/install_test.sh @@ -2,7 +2,7 @@ # Copyright (C) Juewuy echo='echo -e' && [ -n "$(ls -l /bin/sh|grep -o dash)" ] && echo=echo -test=1 +test=2 echo "***********************************************" echo "** 欢迎使用 **"