diff --git a/install.sh b/install.sh index 4eec1ae..8959ab3 100644 --- a/install.sh +++ b/install.sh @@ -153,7 +153,6 @@ echo 目标目录磁盘剩余:$(df -h $dir | awk '{print $4}' | sed 1d ) read -p "确认安装?(1/0) > " res [ "$res" != "1" ] && setdir clashdir=$dir/clash -install } #输出 @@ -175,9 +174,11 @@ if [ -n "$clashdir" ];then echo ----------------------------------------------- $echo "\033[31m 旧版本文件已卸载!\033[0m" setdir + install elif [ "$res" = "9" ];then echo 测试模式,变更安装位置 setdir + install else $echo "\033[31m输入错误!已取消安装!\033[0m" exit; diff --git a/scripts/getdate.sh b/scripts/getdate.sh index 3621807..afb5f03 100644 --- a/scripts/getdate.sh +++ b/scripts/getdate.sh @@ -681,7 +681,8 @@ getdb(){ sed -i "s/127.0.0.1/${host}/g" $dbdir/app*.js sed -i "s/7892/${db_port}/g" $dbdir/app*.js fi - [ "$dbdir" != "/www/clash" ] && $clashdir/start.sh restart + #如果clash在运行则重启clash服务 + [ "$dbdir" != "/www/clash" ] && [ -n "$PID" ] && $clashdir/start.sh restart #写入配置文件 sed -i '/hostdir*/'d $ccfg sed -i "1i\hostdir=\'$hostdir\'" $ccfg