From 08243de4e431abc783c97c012145dec447b5d6f5 Mon Sep 17 00:00:00 2001 From: juewuy Date: Sat, 22 Aug 2020 22:01:58 +0800 Subject: [PATCH] =?UTF-8?q?v0.9.9=20~=E6=96=B0=E5=A2=9E=E4=BF=9D=E5=AE=88?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E5=90=AF=E5=8A=A8=EF=BC=8C=E9=80=82=E9=85=8D?= =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E8=AE=BE=E5=A4=87=EF=BC=88=E5=B0=8F=E7=B1=B3?= =?UTF-8?q?3HD=EF=BC=8C=E4=BB=A5=E5=8F=8A=E5=85=B6=E4=BB=96linux=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=EF=BC=89=20~=E6=96=B0=E5=A2=9E=E8=BF=9B=E9=98=B6?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=8F=9C=E5=8D=95=20~=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=BA=86geoip=E6=95=B0=E6=8D=AE=E5=BA=93=E5=81=B6=E5=B0=94?= =?UTF-8?q?=E4=B8=A2=E5=A4=B1=E7=9A=84bug(=E6=84=9F=E8=B0=A2Pan=20Peter?= =?UTF-8?q?=E5=90=8C=E5=AD=A6=E6=8F=90=E4=BA=A4bug=EF=BC=81)=20~=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BA=86=E5=8F=A6=E4=B8=80=E7=A7=8D=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E7=9A=84=E5=AE=89=E8=A3=85=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=20~UI=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/clashfm.tar.gz | Bin 13673 -> 13706 bytes bin/version | 2 +- scripts/getdate.sh | 43 +++++++++++++++++++++++++++---------------- scripts/start.sh | 8 +++++--- 4 files changed, 33 insertions(+), 20 deletions(-) diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz index 60d504fac00f5eb4075284bcd3adfc697091baec..9c8b2951955a0f3db4a88efb93c21e0249ed034d 100644 GIT binary patch delta 9963 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 z�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 I$N>HT01mS-I{*Lx diff --git a/bin/version b/bin/version index e0c1dcc..f6c77a4 100644 --- a/bin/version +++ b/bin/version @@ -1,2 +1,2 @@ GeoIP_v=20200817 -versionsh=0.9.8 +versionsh=0.9.9 diff --git a/scripts/getdate.sh b/scripts/getdate.sh index 6992730..4c96cac 100644 --- a/scripts/getdate.sh +++ b/scripts/getdate.sh @@ -425,12 +425,27 @@ echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[36m安装本地版dashboard管理面板\033[0m" echo ----------------------------------------------- echo -e "\033[32m打开管理面板的速度更快且更稳定" -echo -e "\033[33m需要占用约500kb的本地空间(目录:/www/clash)\033[0m" -echo -e "\033[36m可以使用\033[32;4mhttp://$host/clash\033[0;36m访问面板\033[0m" +echo -e "\033[33m需要占用约500kb的本地空间\033[0m" echo ----------------------------------------------- -read -p "是否安装本地面板?[1/0] > " res -if [ "$res" = '1' ]; then - if [ -d /www/clash ];then +echo " 1 在/www/clash目录安装(http://$host/clash,可能安装失败!)" +echo " 2 在$clashdir/ui目录安装(http://$host:9999/ui,推荐!)" +echo ----------------------------------------------- +echo " 0 返回上级菜单!" +read -p "请输入对应数字 > " num + +if [ -z "$num" ];then + update +elif [ "$num" = '1' ]; then + dbdir=/www/clash + hostdir=':9999/ui' +elif [ "$num" = '2' ]; then + dbdir=$clashdir/ui + hostdir='/clash' +else + update +fi + #下载及安装 + if [ -d /www/clash -o -d $clashdir/ui ];then echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m检测到您已经安装过本地面板了!\033[0m" echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -439,6 +454,7 @@ if [ "$res" = '1' ]; then update elif [ "$res" = 1 ]; then rm -rf /www/clash + rm -rf $clashdir/ui else update fi @@ -454,25 +470,20 @@ if [ "$res" = '1' ]; then getdb else echo -e "\033[33m下载成功,正在解压文件!\033[0m" - if cat /proc/mounts | grep -q www ;then - echo 检测到/www为只读,正在重新挂载! - mount -o remount -w /www - fi - chmod 755 /www - mkdir -p /www/clash > /dev/null - tar -zxvf '/tmp/clashdb.tar.gz' -C /www/clash > /dev/null + mkdir -p $dbdir > /dev/null + tar -zxvf '/tmp/clashdb.tar.gz' -C $dbdir > /dev/null [ $? -ne 0 ] && echo "文件解压失败!" && exit 1 #修改默认host和端口 - sed -i "s/127.0.0.1/$host/g" /www/clash/js/*.js - sed -i "s/9090/9999/g" /www/clash/js/*.js + sed -i "s/127.0.0.1/$host/g" $dbdir/js/*.js + sed -i "s/9090/9999/g" $dbdir/js/*.js # echo -e "\033[32m面板安装成功!\033[0m" echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - echo -e "\033[36m请使用\033[32;4mhttp://$host/clash\033[0;36m访问面板\033[0m" + echo -e "\033[36m请使用\033[32;4mhttp://$host$hostdir\033[0;36m访问面板\033[0m" rm -rf /tmp/clashdb.tar.gz update fi -fi + update } setserver(){ diff --git a/scripts/start.sh b/scripts/start.sh index 9489309..0bf4649 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -33,6 +33,7 @@ else ipv6='ipv6: false' fi external='external-controller: 0.0.0.0:9999' +external_ui='external-ui: ui' if [ "$dns_mod" = "fake-ip" ];then dns='dns: {enable: true, listen: 0.0.0.0:1053, fake-ip-range: 198.18.0.1/16, enhanced-mode: fake-ip, nameserver: [114.114.114.114, 127.0.0.1:53], fallback: [tcp://1.0.0.1, 8.8.4.4]}' elif [ "$dns_over" = "已开启" ];then @@ -59,9 +60,10 @@ exper='experimental: {ignore-resolve-fail: true, interface-name: en0}' sed -i "4a$log" $clashdir/config.yaml sed -i "5a$ipv6" $clashdir/config.yaml sed -i "6a$external" $clashdir/config.yaml - sed -i "7a$dns" $clashdir/config.yaml - sed -i "8a$tun" $clashdir/config.yaml - sed -i "9a$exper" $clashdir/config.yaml + sed -i "7a$external_ui" $clashdir/config.yaml + sed -i "8a$dns" $clashdir/config.yaml + sed -i "9a$tun" $clashdir/config.yaml + sed -i "10a$exper" $clashdir/config.yaml #跳过本地tls证书验证 if [ "$skip_cert" != "未开启" ];then sed -i "10,99s/sni: \S*/\1skip-cert-verify: true}/" $clashdir/config.yaml #跳过trojan本地证书验证