fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OpenClash: sync with upstream source

Browse Source
This commit is contained in:
CN_SZTL 2020-03-30 19:41:21 +08:00
parent 0e4007eacd
commit 39c78e6d1b
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash.sh
View File

@ -35,7 +35,6 @@ config_cus_up()
fi
if [ "$servers_update" -eq "1" ] || [ ! -z "$keyword" ]; then
echo "配置文件【$name】替换成功，开始挑选节点..." >$START_LOG
echo "${LOGTIME} Config 【$name】 Update Successful" >>$LOG_FILE
uci set openclash.config.config_update_path="/etc/openclash/config/$name.yaml"
uci set openclash.config.servers_if_update=1
uci commit openclash
@ -46,13 +45,17 @@ config_cus_up()
if [ "$CONFIG_FILE" == "$CONFIG_PATH" ]; then
if_restart=1
fi
echo "${LOGTIME} Config 【$name】 Update Successful" >>$LOG_FILE
echo "配置文件【$name】更新成功！" >$START_LOG
sleep 3
echo "" >$START_LOG
elif [ "$CONFIG_FILE" == "$CONFIG_PATH" ]; then
echo "配置文件【$name】替换成功 ..." >$START_LOG
echo "${LOGTIME} Config 【$name】 Update Successful" >>$LOG_FILE
echo "配置文件【$name】更新成功！" >$START_LOG
sleep 3
if_restart=1
else
echo "配置文件【$name】替换成功 ..." >$START_LOG
echo "配置文件【$name】更新成功！" >$START_LOG
echo "${LOGTIME} Config 【$name】 Update Successful" >>$LOG_FILE
sleep 3
echo "" >$START_LOG

4
package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_groups_get.sh
View File

@ -97,12 +97,14 @@ count=1
file_count=1
match_group_file="/tmp/Proxy_Group"
group_file="/tmp/yaml_group.yaml"
sed -i "s/\'//g" $group_file 2>/dev/null
sed -i 's/\"//g' $group_file 2>/dev/null
line=$(sed -n '/name:/=' $group_file 2>/dev/null)
num=$(grep -c "name:" $group_file 2>/dev/null)
cfg_get()
{
echo "$(grep "$1" "$2" 2>/dev/null |awk -v tag=$1 'BEGIN{FS=tag} {print $2}' 2>/dev/null |sed 's/,.*//' 2>/dev/null |sed 's/\}.*//' 2>/dev/null |sed 's/^ \{0,\}//g' 2>/dev/null |sed 's/ \{0,\}$//g' 2>/dev/null |sed "s/^\'//g" 2>/dev/null |sed "s/\'$//g" 2>/dev/null)"
echo "$(grep "$1" "$2" 2>/dev/null |awk -v tag=$1 'BEGIN{FS=tag} {print $2}' 2>/dev/null |sed 's/,.*//' 2>/dev/null |sed 's/\}.*//' 2>/dev/null |sed 's/^ \{0,\}//g' 2>/dev/null |sed 's/ \{0,\}$//g' 2>/dev/null)"
}
for n in $line

8
package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_proxys_get.sh
View File

@ -67,11 +67,15 @@ servers_if_update=$(uci get openclash.config.servers_if_update 2>/dev/null)
new_servers_group=$(uci get openclash.config.new_servers_group 2>/dev/null)
#proxy
sed -i "s/\'//g" $server_file 2>/dev/null
sed -i 's/\"//g' $server_file 2>/dev/null
line=$(sed -n '/name:/=' $server_file 2>/dev/null)
num=$(grep -c "name:" $server_file 2>/dev/null)
count=1
#provider
sed -i "s/\'//g" $provider_file 2>/dev/null
sed -i 's/\"//g' $provider_file 2>/dev/null
sed -i '/^ *$/d' $provider_file 2>/dev/null
sed -i '/^ \{0,\}#/d' $provider_file 2>/dev/null
sed -i 's/\t/ /g' $provider_file 2>/dev/null
@ -81,12 +85,12 @@ provider_count=1
cfg_get()
{
echo "$(grep "$1" "$2" 2>/dev/null |awk -v tag=$1 'BEGIN{FS=tag} {print $2}' 2>/dev/null |sed 's/,.*//' 2>/dev/null |sed 's/\}.*//' 2>/dev/null |sed 's/^ \{0,\}//g' 2>/dev/null |sed 's/ \{0,\}$//g' 2>/dev/null |sed "s/^\'//g" 2>/dev/null |sed "s/\'$//g" 2>/dev/null)"
echo "$(grep "$1" "$2" 2>/dev/null |awk -v tag=$1 'BEGIN{FS=tag} {print $2}' 2>/dev/null |sed 's/,.*//' 2>/dev/null |sed 's/\}.*//' 2>/dev/null |sed 's/^ \{0,\}//g' 2>/dev/null |sed 's/ \{0,\}$//g' 2>/dev/null)"
}
cfg_get_alpn()
{
echo "$(grep "^ \{0,\}$1" "$2" 2>/dev/null |grep -v "^ \{0,\}- name:" |awk -v tag=$1 'BEGIN{FS=tag} {print $2}' 2>/dev/null |sed 's/,.*//' 2>/dev/null |sed 's/\}.*//' 2>/dev/null |sed 's/^ \{0,\}//g' 2>/dev/null |sed 's/ \{0,\}$//g' 2>/dev/null |sed "s/^\'//g" 2>/dev/null |sed "s/\'$//g" 2>/dev/null)"
echo "$(grep "^ \{0,\}$1" "$2" 2>/dev/null |grep -v "^ \{0,\}- name:" |awk -v tag=$1 'BEGIN{FS=tag} {print $2}' 2>/dev/null |sed 's/,.*//' 2>/dev/null |sed 's/\}.*//' 2>/dev/null |sed 's/^ \{0,\}//g' 2>/dev/null |sed 's/ \{0,\}$//g' 2>/dev/null)"
}
echo "开始更新【$CONFIG_NAME】的代理集配置..." >$START_LOG