diff --git a/bin/ShellClash.tar.gz b/bin/ShellClash.tar.gz index 1872de5..a8c3183 100644 Binary files a/bin/ShellClash.tar.gz and b/bin/ShellClash.tar.gz differ diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz index fffca12..7ee2e1e 100644 Binary files a/bin/clashfm.tar.gz and b/bin/clashfm.tar.gz differ diff --git a/bin/public.tar.gz b/bin/public.tar.gz index fbc0225..43b580a 100644 Binary files a/bin/public.tar.gz and b/bin/public.tar.gz differ diff --git a/bin/version b/bin/version index d711efa..a545306 100644 --- a/bin/version +++ b/bin/version @@ -3,4 +3,4 @@ clashpre_v=2022.11.25 clash_v=v1.7.1 meta_v=v1.17.0 GeoIP_v=20231230 -versionsh=1.8.2d +versionsh=1.8.2e diff --git a/scripts/getdate.sh b/scripts/getdate.sh index 4d28149..3a88779 100644 --- a/scripts/getdate.sh +++ b/scripts/getdate.sh @@ -744,7 +744,7 @@ gettar(){ echo ----------------------------------------------- echo 开始解压文件! mkdir -p $CRASHDIR > /dev/null - tar -zxvf "$TMPDIR/clashfm.tar.gz" -C $CRASHDIR/ + tar -zxvf "$TMPDIR/clashfm.tar.gz" -C $CRASHDIR/ || tar -zxvf "$TMPDIR/clashfm.tar.gz" --no-same-owner -C $CRASHDIR/ if [ $? -ne 0 ];then rm -rf $TMPDIR/clashfm.tar.gz echo -e "\033[33m文件解压失败!\033[0m" diff --git a/scripts/init.sh b/scripts/init.sh index 2c049c6..d8419c4 100644 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -1,7 +1,7 @@ #!/bin/sh # Copyright (C) Juewuy -version=1.8.2d +version=1.8.2e setdir(){ dir_avail(){ @@ -143,6 +143,7 @@ $CRASHDIR/start.sh stop 2>/dev/null #防止进程冲突 [ -w "/var/mnt/cfg/firewall" ] && systype=ng_snapshot #NETGEAR设备 #检查环境变量 +[ -z "$CRASHDIR" -a -n "$clashdir" ] && CRASHDIR=$clashdir [ -z "$CRASHDIR" -a -d /tmp/SC_tmp ] && { setdir } diff --git a/scripts/task.sh b/scripts/task.sh index fb718a4..3e4c2a4 100644 --- a/scripts/task.sh +++ b/scripts/task.sh @@ -69,7 +69,7 @@ update_shellclash(){ #自动更新脚本 return 1 else #解压 - tar -zxvf "$TMPDIR/clashfm.tar.gz" -C $CRASHDIR/ + tar -zxvf "$TMPDIR/clashfm.tar.gz" -C $CRASHDIR/ || tar -zxvf "$TMPDIR/clashfm.tar.gz" --no-same-owner -C $CRASHDIR/ if [ $? -ne 0 ];then rm -rf $TMPDIR/clashfm.tar.gz logger "任务:【自动更新内核】出错-解压失败!"