xm/ShellCrash
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.6.2

Browse Source 
~优化内核下载检测机制
~替换shellclash.ga为shellclash.cf域名
This commit is contained in:
juewuy
2022-06-04 13:31:52 +08:00
parent 703b87afc7
commit 57368d1311
6 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -57,8 +57,8 @@ export url='https://fastly.jsdelivr.net/gh/juewuy/ShellClash@master' && wget -q
~**Use a low version of wget (prompt not to support https) local installation**:<br> ~**Use a low version of wget (prompt not to support https) local installation**:<br>
```Shell ```Shell
#by shellclash.ga #by shellclash.cf
export url='http://shellclash.ga/' && wget -q -O /tmp/install.sh $url/install.sh && sh /tmp/install.sh && source /etc/profile &> /dev/null export url='http://shellclash.cf/' && wget -q -O /tmp/install.sh $url/install.sh && sh /tmp/install.sh && source /etc/profile &> /dev/null
``` ```
~**After installation by non-root users**, please execute the following additional commands to read environment variables:<br> ~**After installation by non-root users**, please execute the following additional commands to read environment variables:<br>

6
README_CN.md
View File

@@ -56,7 +56,7 @@ export url='https://raw.githubusercontent.com/juewuy/ShellClash/master' && sh -c
#jsDelivrCDN源 #jsDelivrCDN源
export url='https://fastly.jsdelivr.net/gh/juewuy/ShellClash@master' && sh -c "$(curl -kfsSl $url/install.sh)" && source /etc/profile &> /dev/null export url='https://fastly.jsdelivr.net/gh/juewuy/ShellClash@master' && sh -c "$(curl -kfsSl $url/install.sh)" && source /etc/profile &> /dev/null
#作者私人源 #作者私人源
export url='https://shellclash.ga' && sh -c "$(curl -kfsSl $url/install.sh)" && source /etc/profile &> /dev/null export url='https://shellclash.cf' && sh -c "$(curl -kfsSl $url/install.sh)" && source /etc/profile &> /dev/null
``` ```
~**使用wget安装**：<br> ~**使用wget安装**：<br>
@@ -67,14 +67,14 @@ export url='https://raw.githubusercontent.com/juewuy/ShellClash/master' && wget
#jsDelivrCDN源 #jsDelivrCDN源
export url='https://fastly.jsdelivr.net/gh/juewuy/ShellClash@master' && wget -q --no-check-certificate -O /tmp/install.sh $url/install.sh && sh /tmp/install.sh && source /etc/profile &> /dev/null export url='https://fastly.jsdelivr.net/gh/juewuy/ShellClash@master' && wget -q --no-check-certificate -O /tmp/install.sh $url/install.sh && sh /tmp/install.sh && source /etc/profile &> /dev/null
#作者私人源 #作者私人源
export url='http://shellclash.ga/' && wget -q -O /tmp/install.sh $url/install.sh && sh /tmp/install.sh && source /etc/profile &> /dev/null export url='http://shellclash.cf/' && wget -q -O /tmp/install.sh $url/install.sh && sh /tmp/install.sh && source /etc/profile &> /dev/null
``` ```
~**使用低版本wget（提示不支持https）安装**：<br> ~**使用低版本wget（提示不支持https）安装**：<br>
```Shell ```Shell
#作者私人http源 #作者私人http源
export url='http://shellclash.ga/' && wget -q -O /tmp/install.sh $url/install.sh && sh /tmp/install.sh && source /etc/profile &> /dev/null export url='http://shellclash.cf/' && wget -q -O /tmp/install.sh $url/install.sh && sh /tmp/install.sh && source /etc/profile &> /dev/null
``` ```
~**非root用户安装后**请额外执行以下命令以读取环境变量：<br> ~**非root用户安装后**请额外执行以下命令以读取环境变量：<br>

BIN
bin/clashfm.tar.gz
View File

Binary file not shown.

2
bin/version
View File

@@ -3,4 +3,4 @@ clashpre_v=2021.09.15
clash_v=v1.7.1 clash_v=v1.7.1
GeoIP_v=20220531 GeoIP_v=20220531
meta_v=1.11.1 meta_v=1.11.1
versionsh=1.6.1 versionsh=1.6.2

23
scripts/getdate.sh
View File

@@ -37,7 +37,7 @@ linkserver(){
echo -e "\033[32m感谢以下作者的无私奉献！！！\033[0m" echo -e "\033[32m感谢以下作者的无私奉献！！！\033[0m"
echo 当前使用后端为：$server_link echo 当前使用后端为：$server_link
echo 1 api.dler.io （墙洞提供） echo 1 api.dler.io （墙洞提供）
echo 2 sub.shellclash.ga （作者提供） echo 2 sub.shellclash.cf （作者提供）
echo 3 sub.xeton.dev （SUB作者T大提供） echo 3 sub.xeton.dev （SUB作者T大提供）
echo 4 sub.id9.cc （品云提供） echo 4 sub.id9.cc （品云提供）
echo 5 sub.maoxiongnet.com （猫熊提供） echo 5 sub.maoxiongnet.com （猫熊提供）
@@ -452,12 +452,19 @@ getcore(){
$clashdir/start.sh webget /tmp/clash.new $corelink $clashdir/start.sh webget /tmp/clash.new $corelink
if [ "$?" = "1" ];then if [ "$?" = "1" ];then
echo -e "\033[31m核心文件下载失败！\033[0m" echo -e "\033[31m核心文件下载失败！\033[0m"
rm -rf /tmp/clash.new
else else
echo -e "\033[32m$clashcore核心下载成功！\033[0m" chmod -x /tmp/clash.new && /tmp/clash.new -v >/dev/null 2>&1
mv -f /tmp/clash.new $bindir/clash if [ "$?" != 0 ];then
chmod 777 $bindir/clash #授予权限 echo -e "\033[31m核心文件下载失败！\033[0m"
setconfig clashcore $clashcore rm -rf /tmp/clash.new
setconfig clashv $version else
echo -e "\033[32m$clashcore核心下载成功！\033[0m"
mv -f /tmp/clash.new $bindir/clash
chmod -x $bindir/clash
setconfig clashcore $clashcore
setconfig clashv $version
fi
fi fi
} }
setcore(){ setcore(){
@@ -776,7 +783,7 @@ setserver(){
release_url='' release_url=''
saveserver saveserver
elif [ "$num" = 4 ]; then elif [ "$num" = 4 ]; then
update_url='https://gh.shellclash.ga/master' update_url='https://gh.shellclash.cf/master'
release_url='' release_url=''
saveserver saveserver
elif [ "$num" = 5 ]; then elif [ "$num" = 5 ]; then
@@ -788,7 +795,7 @@ setserver(){
release_url='' release_url=''
saveserver saveserver
elif [ "$num" = 7 ]; then elif [ "$num" = 7 ]; then
update_url='http://test.shellclash.ga' update_url='http://test.shellclash.cf'
release_url='' release_url=''
saveserver saveserver
elif [ "$num" = 8 ]; then elif [ "$num" = 8 ]; then

6
scripts/start.sh
View File

@@ -137,7 +137,7 @@ getyaml(){
#前后端订阅服务器地址索引，可在此处添加！ #前后端订阅服务器地址索引，可在此处添加！
Server=`sed -n ""$server_link"p"<<EOF Server=`sed -n ""$server_link"p"<<EOF
https://api.dler.io https://api.dler.io
https://sub.shellclash.ga https://sub.shellclash.cf
https://sub.xeton.dev https://sub.xeton.dev
https://sub.id9.cc https://sub.id9.cc
https://sub.maoxiongnet.com https://sub.maoxiongnet.com
@@ -164,7 +164,7 @@ EOF`
Https=$(echo ${Https//\%26/\&}) #将%26替换回& Https=$(echo ${Https//\%26/\&}) #将%26替换回&
#如果传来的是Url链接则合成Https链接，否则直接使用Https链接 #如果传来的是Url链接则合成Https链接，否则直接使用Https链接
if [ -z "$Https" ];then if [ -z "$Https" ];then
[ -n "$(echo $Url | grep -o 'vless')" ] && Server='https://sub.shellclash.ga' [ -n "$(echo $Url | grep -o 'vless')" ] && Server='https://sub.shellclash.cf'
Https="$Server/sub?target=clash&insert=true&new_name=true&scv=true&udp=true&exclude=$exclude&include=$include&url=$Url&config=$Config" Https="$Server/sub?target=clash&insert=true&new_name=true&scv=true&udp=true&exclude=$exclude&include=$include&url=$Url&config=$Config"
url_type=true url_type=true
fi fi
@@ -756,8 +756,6 @@ bfstart(){
[ ! -d $bindir/ui ] && mkdir -p $bindir/ui [ ! -d $bindir/ui ] && mkdir -p $bindir/ui
update_url=https://ghproxy.com/https://raw.githubusercontent.com/juewuy/ShellClash/master update_url=https://ghproxy.com/https://raw.githubusercontent.com/juewuy/ShellClash/master
#检查clash核心 #检查clash核心
$bindir/clash -v >/dev/null 2>&1
[ "$?" != 0 ] && rm -rf $bindir/clash
if [ ! -f $bindir/clash ];then if [ ! -f $bindir/clash ];then
if [ -f $clashdir/clash ];then if [ -f $clashdir/clash ];then
mv $clashdir/clash $bindir/clash && chmod +x $bindir/clash mv $clashdir/clash $bindir/clash && chmod +x $bindir/clash