mirror of
https://github.com/wnlen/clash-for-linux.git
synced 2025-05-06 20:14:44 +08:00
feat: seperate config update with start.sh
This commit is contained in:
NekoRectifier
parent
226b847397
commit
16948a8709
83
start.sh
83
start.sh
|
|
@ -25,6 +25,11 @@ Log_Dir="$Server_Dir/logs"
|
|||
# 将 CLASH_URL 变量的值赋给 URL 变量，并检查 CLASH_URL 是否为空
|
||||
URL=${CLASH_URL:?Error: CLASH_URL variable is not set or empty}
|
||||
|
||||
export URL
|
||||
export Conf_Dir
|
||||
export Server_Dir
|
||||
export Temp_Dir
|
||||
|
||||
# 获取 CLASH_SECRET 值，如果不存在则生成一个随机数
|
||||
Secret=${CLASH_SECRET:-$(openssl rand -hex 32)}
|
||||
|
||||
|
|
@ -93,65 +98,38 @@ unset NO_PROXY
|
|||
|
||||
# create logs folder
|
||||
if [ -d $Server_Dir"/logs" ]; then
|
||||
echo "logs folder exists."
|
||||
echo ""
|
||||
else
|
||||
echo -e "\nlogs 文件夹缺失，正在创建..."
|
||||
mkdir logs
|
||||
fi
|
||||
|
||||
## Clash 订阅地址检测及配置文件下载
|
||||
# 检查url是否有效
|
||||
echo -e '\n正在检测订阅地址...'
|
||||
Text1="Clash订阅地址可访问！"
|
||||
Text2="Clash订阅地址不可访问！"
|
||||
#curl -o /dev/null -s -m 10 --connect-timeout 10 -w %{http_code} $URL | grep '[23][0-9][0-9]' &>/dev/null
|
||||
curl -o /dev/null -L -k -sS --retry 5 -m 10 --connect-timeout 10 -w "%{http_code}" $URL | grep -E '^[23][0-9]{2}$' &>/dev/null
|
||||
ReturnStatus=$?
|
||||
if_success $Text1 $Text2 $ReturnStatus
|
||||
Actual_Conf="$Conf_Dir/config.yaml"
|
||||
|
||||
# 拉取更新config.yml文件
|
||||
echo -e '\n正在下载Clash配置文件...'
|
||||
Text3="配置文件config.yaml下载成功！"
|
||||
Text4="配置文件config.yaml下载失败，退出启动！"
|
||||
# 获取文件的修改时间（秒级时间戳）
|
||||
modified_time=$(stat -c %Y "$Actual_Conf")
|
||||
|
||||
# 尝试使用curl进行下载
|
||||
curl -L -k -sS --retry 5 -m 10 -o $Temp_Dir/clash.yaml $URL
|
||||
ReturnStatus=$?
|
||||
if [ $ReturnStatus -ne 0 ]; then
|
||||
# 如果使用curl下载失败，尝试使用wget进行下载
|
||||
for i in {1..10}
|
||||
do
|
||||
wget -q --no-check-certificate -O $Temp_Dir/clash.yaml $URL
|
||||
ReturnStatus=$?
|
||||
if [ $ReturnStatus -eq 0 ]; then
|
||||
break
|
||||
else
|
||||
continue
|
||||
fi
|
||||
done
|
||||
# 获取当前时间（秒级时间戳）
|
||||
current_time=$(date +%s)
|
||||
|
||||
# 计算文件修改时间距离现在的时间差（秒）
|
||||
time_diff=$((current_time - modified_time))
|
||||
|
||||
# 计算24小时对应的秒数
|
||||
tf_hours=$((24 * 60 * 60))
|
||||
|
||||
if [ -f $Actual_Conf ]; then
|
||||
echo -e "\n正在检查先前配置文件"
|
||||
if [ "$time_diff" -lt "$tf_hours" ]; then
|
||||
echo -e "\n当前配置文件有效，跳过更新"
|
||||
else
|
||||
echo -e "\n配置文件已过期，重新更新..."
|
||||
bash update.sh
|
||||
fi
|
||||
else
|
||||
echo -e "\n配置文件不存在，重新更新..."
|
||||
bash update.sh
|
||||
fi
|
||||
if_success $Text3 $Text4 $ReturnStatus
|
||||
|
||||
# 重命名clash配置文件
|
||||
\cp -a $Temp_Dir/clash.yaml $Temp_Dir/clash_config.yaml
|
||||
|
||||
|
||||
## 判断订阅内容是否符合clash配置文件标准，尝试转换（当前不支持对 x86_64 以外的CPU架构服务器进行clash配置文件检测和转换，此功能将在后续添加）
|
||||
if [[ $CpuArch =~ "x86_64" || $CpuArch =~ "amd64" ]]; then
|
||||
echo -e '\n判断订阅内容是否符合clash配置文件标准:'
|
||||
bash $Server_Dir/scripts/clash_profile_conversion.sh
|
||||
sleep 3
|
||||
fi
|
||||
|
||||
|
||||
## Clash 配置文件重新格式化及配置
|
||||
# 取出代理相关配置
|
||||
#sed -n '/^proxies:/,$p' $Temp_Dir/clash.yaml > $Temp_Dir/proxy.txt
|
||||
sed -n '/^proxies:/,$p' $Temp_Dir/clash_config.yaml > $Temp_Dir/proxy.txt
|
||||
|
||||
# 合并形成新的config.yaml
|
||||
cat $Temp_Dir/templete_config.yaml > $Temp_Dir/config.yaml
|
||||
cat $Temp_Dir/proxy.txt >> $Temp_Dir/config.yaml
|
||||
\cp $Temp_Dir/config.yaml $Conf_Dir/
|
||||
|
||||
# Configure Clash Dashboard
|
||||
Work_Dir=$(cd $(dirname $0); pwd)
|
||||
|
|
@ -161,6 +139,7 @@ sed -r -i '/^secret: /s@(secret: ).*@\1'${Secret}'@g' $Conf_Dir/config.yaml
|
|||
|
||||
PID=`ps -ef | grep [c]lash-linux-a | awk '{print $2}'`
|
||||
|
||||
## Prevent clash instance is started again
|
||||
if [ -z "$PID" ]; then
|
||||
echo -e "Clash isn't running"
|
||||
else
|
||||
|
|
|
|||
56
update.sh
Normal file
56
update.sh
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
#!/bin/bash
|
||||
|
||||
## Clash 订阅地址检测及配置文件下载
|
||||
# 检查url是否有效
|
||||
echo -e '\n正在检测订阅地址...'
|
||||
Text1="Clash订阅地址可访问！"
|
||||
Text2="Clash订阅地址不可访问！"
|
||||
#curl -o /dev/null -s -m 10 --connect-timeout 10 -w %{http_code} $URL | grep '[23][0-9][0-9]' &>/dev/null
|
||||
curl -o /dev/null -L -k -sS --retry 5 -m 10 --connect-timeout 10 -w "%{http_code}" $URL | grep -E '^[23][0-9]{2}$' &>/dev/null
|
||||
ReturnStatus=$?
|
||||
if_success $Text1 $Text2 $ReturnStatus
|
||||
|
||||
# 拉取更新config.yml文件
|
||||
echo -e '\n正在下载Clash配置文件...'
|
||||
Text3="配置文件config.yaml下载成功！"
|
||||
Text4="配置文件config.yaml下载失败，退出启动！"
|
||||
|
||||
# 尝试使用curl进行下载
|
||||
curl -L -k -sS --retry 5 -m 10 -o $Temp_Dir/clash.yaml $URL
|
||||
ReturnStatus=$?
|
||||
if [ $ReturnStatus -ne 0 ]; then
|
||||
# 如果使用curl下载失败，尝试使用wget进行下载
|
||||
for i in {1..10}
|
||||
do
|
||||
wget -q --no-check-certificate -O $Temp_Dir/clash.yaml $URL
|
||||
ReturnStatus=$?
|
||||
if [ $ReturnStatus -eq 0 ]; then
|
||||
break
|
||||
else
|
||||
continue
|
||||
fi
|
||||
done
|
||||
fi
|
||||
if_success $Text3 $Text4 $ReturnStatus
|
||||
|
||||
# 重命名clash配置文件
|
||||
\cp -a $Temp_Dir/clash.yaml $Temp_Dir/clash_config.yaml
|
||||
|
||||
|
||||
## 判断订阅内容是否符合clash配置文件标准，尝试转换（当前不支持对 x86_64 以外的CPU架构服务器进行clash配置文件检测和转换，此功能将在后续添加）
|
||||
if [[ $CpuArch =~ "x86_64" || $CpuArch =~ "amd64" ]]; then
|
||||
echo -e '\n判断订阅内容是否符合clash配置文件标准:'
|
||||
bash $Server_Dir/scripts/clash_profile_conversion.sh
|
||||
sleep 3
|
||||
fi
|
||||
|
||||
|
||||
## Clash 配置文件重新格式化及配置
|
||||
# 取出代理相关配置
|
||||
#sed -n '/^proxies:/,$p' $Temp_Dir/clash.yaml > $Temp_Dir/proxy.txt
|
||||
sed -n '/^proxies:/,$p' $Temp_Dir/clash_config.yaml > $Temp_Dir/proxy.txt
|
||||
|
||||
# 合并形成新的config.yaml
|
||||
cat $Temp_Dir/templete_config.yaml > $Temp_Dir/config.yaml
|
||||
cat $Temp_Dir/proxy.txt >> $Temp_Dir/config.yaml
|
||||
\cp $Temp_Dir/config.yaml $Conf_Dir/
|
||||
Loading…
Reference in New Issue
Block a user