~优化安装脚本及安装流程
~合并https://github.com/juewuy/ShellClash/pull/309
This commit is contained in:
juewuy
2023-01-23 17:17:30 +08:00
parent 4447244b61
commit 6794271c5e
6 changed files with 9 additions and 11 deletions

View File

@@ -151,9 +151,8 @@ getlink(){
if [ -n "$Url_link" ];then
i=100
#将用户链接写入mark
sed -i '/Https=*/'d $ccfg
setconfig Https
setconfig Url \'$Url_link\'
Https=""
#获取在线yaml文件
getyaml
else

View File

@@ -1,7 +1,7 @@
#!/bin/sh
# Copyright (C) Juewuy
version=
version=1.7.0
setdir(){
dir_avail(){

View File

@@ -1114,7 +1114,8 @@ bfstart(){
[ -z "$cpucore" ] && logger 找不到设备的CPU信息请手动指定处理器架构类型 31 && setcpucore
[ "$update_url" = "https://jwsc.eu.org:8888" ] && [ "$clashcore" != 'clash' ] && update_url=https://fastly.jsdelivr.net/gh/juewuy/ShellClash@master
$0 webget $bindir/clash "$update_url/bin/$clashcore/clash-linux-$cpucore"
[ "$?" = "1" ] && rm -rf $bindir/clash && logger "核心下载失败,已退出!" 31 && exit 1
#校验内核
chmod +x $bindir/clash 2>/dev/null
clashv=$($bindir/clash -v 2>/dev/null | sed 's/ linux.*//;s/.* //')
if [ -z "$clashv" ];then
rm -rf $bindir/clash
@@ -1420,9 +1421,7 @@ unset_proxy)
sed -i '/all_proxy/'d $profile
sed -i '/ALL_PROXY/'d $profile
;;
-t)
$2 $3 $4 $5 $6
;;
esac
exit 0