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域名
~屏蔽curl各类报错提示
This commit is contained in:
juewuy
2022-06-04 13:41:58 +08:00
parent 57368d1311
commit 12b25cacf8
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/clashfm.tar.gz
View File

Binary file not shown.

10
scripts/getdate.sh
View File

@@ -333,7 +333,7 @@ gettar(){
if [ -f /etc/rc.common ];then if [ -f /etc/rc.common ];then
#设为init.d方式启动 #设为init.d方式启动
cp -f $clashdir/clashservice /etc/init.d/clash cp -f $clashdir/clashservice /etc/init.d/clash
chmod 755 /etc/init.d/clash chmod +x /etc/init.d/clash
else else
[ -w /etc/systemd/system ] && sysdir=/etc/systemd/system [ -w /etc/systemd/system ] && sysdir=/etc/systemd/system
[ -w /usr/lib/systemd/system ] && sysdir=/usr/lib/systemd/system [ -w /usr/lib/systemd/system ] && sysdir=/usr/lib/systemd/system
@@ -350,7 +350,7 @@ gettar(){
#修饰文件及版本号 #修饰文件及版本号
shtype=sh && [ -n "$(ls -l /bin/sh|grep -oE 'dash|show|bash')" ] && shtype=bash shtype=sh && [ -n "$(ls -l /bin/sh|grep -oE 'dash|show|bash')" ] && shtype=bash
sed -i "s|/bin/sh|/bin/$shtype|" $clashdir/start.sh sed -i "s|/bin/sh|/bin/$shtype|" $clashdir/start.sh
chmod 755 $clashdir/start.sh chmod +x $clashdir/start.sh
setconfig versionsh_l $release_new setconfig versionsh_l $release_new
#设置更新地址 #设置更新地址
[ -n "$url" ] && setconfig update_url $url [ -n "$url" ] && setconfig update_url $url
@@ -375,7 +375,7 @@ gettar(){
} }
#小米镜像化OpenWrt额外设置 #小米镜像化OpenWrt额外设置
if [ "$systype" = "mi_snapshot" ];then if [ "$systype" = "mi_snapshot" ];then
chmod 755 $clashdir/misnap_init.sh chmod +x $clashdir/misnap_init.sh
uci set firewall.ShellClash=include uci set firewall.ShellClash=include
uci set firewall.ShellClash.type='script' uci set firewall.ShellClash.type='script'
uci set firewall.ShellClash.path='/data/clash/misnap_init.sh' uci set firewall.ShellClash.path='/data/clash/misnap_init.sh'
@@ -454,14 +454,14 @@ getcore(){
echo -e "\033[31m核心文件下载失败！\033[0m" echo -e "\033[31m核心文件下载失败！\033[0m"
rm -rf /tmp/clash.new rm -rf /tmp/clash.new
else else
chmod -x /tmp/clash.new && /tmp/clash.new -v >/dev/null 2>&1 chmod +x /tmp/clash.new && /tmp/clash.new -v >/dev/null 2>&1
if [ "$?" != 0 ];then if [ "$?" != 0 ];then
echo -e "\033[31m核心文件下载失败！\033[0m" echo -e "\033[31m核心文件下载失败！\033[0m"
rm -rf /tmp/clash.new rm -rf /tmp/clash.new
else else
echo -e "\033[32m$clashcore核心下载成功！\033[0m" echo -e "\033[32m$clashcore核心下载成功！\033[0m"
mv -f /tmp/clash.new $bindir/clash mv -f /tmp/clash.new $bindir/clash
chmod -x $bindir/clash chmod +x $bindir/clash
setconfig clashcore $clashcore setconfig clashcore $clashcore
setconfig clashv $version setconfig clashv $version
fi fi

2
scripts/start.sh
View File

@@ -991,7 +991,7 @@ webget)
[ "$5" = "rediroff" ] && redirect='' || redirect='-L' [ "$5" = "rediroff" ] && redirect='' || redirect='-L'
[ "$6" = "skipceroff" ] && certificate='' || certificate='-k' [ "$6" = "skipceroff" ] && certificate='' || certificate='-k'
#[ -n "$7" ] && agent='-A "clash"' #[ -n "$7" ] && agent='-A "clash"'
result=$(curl $agent -w %{http_code} --connect-timeout 3 $progress $redirect $certificate -o "$2" "$3") result=$(curl $agent -w %{http_code} --connect-timeout 3 $progress $redirect $certificate -o "$2" "$3" 2>/dev/null)
[ "$result" != "200" ] && export all_proxy="" && result=$(curl $agent -w %{http_code} --connect-timeout 3 $progress $redirect $certificate -o "$2" "$3") [ "$result" != "200" ] && export all_proxy="" && result=$(curl $agent -w %{http_code} --connect-timeout 3 $progress $redirect $certificate -o "$2" "$3")
else else
if wget --version > /dev/null 2>&1;then if wget --version > /dev/null 2>&1;then