diff --git a/ShellCrash.tar.gz b/ShellCrash.tar.gz index 382d059d..342aaf1d 100644 Binary files a/ShellCrash.tar.gz and b/ShellCrash.tar.gz differ diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz index 382d059d..342aaf1d 100644 Binary files a/bin/clashfm.tar.gz and b/bin/clashfm.tar.gz differ diff --git a/bin/version b/bin/version index ff252356..5795c678 100644 --- a/bin/version +++ b/bin/version @@ -1,4 +1,4 @@ meta_v=v1.19.17 singboxr_v=1.13.0-alpha.27 -versionsh=1.9.4alpha2.1 +versionsh=1.9.4alpha2.2 GeoIP_v=20251205 diff --git a/scripts/libs/web_get_bin.sh b/scripts/libs/web_get_bin.sh index 67e40156..834858f9 100644 --- a/scripts/libs/web_get_bin.sh +++ b/scripts/libs/web_get_bin.sh @@ -3,13 +3,13 @@ get_bin() { #专用于项目内部文件的下载 [ -z "$update_url" ] && update_url=https://testingcf.jsdelivr.net/gh/juewuy/ShellCrash@master if [ -n "$url_id" ]; then - echo "$2" | grep -q '^bin/' && release_type=update #/bin文件改为在update分支下载 - echo "$2" | grep -qE '^public/|^rules/' && release_type=dev #/public和/rules文件改为在dev分支下载 - [ -z "$release_type" ] && release_type=master + [ -n "$release_type" ] && rt="$release_type" || rt=master + echo "$2" | grep -q '^bin/' && rt=update #/bin文件改为在update分支下载 + echo "$2" | grep -qE '^public/|^rules/' && rt=dev #/public和/rules文件改为在dev分支下载 if [ "$url_id" = 101 -o "$url_id" = 104 ]; then - url="$(grep "$url_id" "$CRASHDIR"/configs/servers.list | awk '{print $3}')@$release_type/$2" #jsdelivr特殊处理 + url="$(grep "$url_id" "$CRASHDIR"/configs/servers.list | awk '{print $3}')@$rt/$2" #jsdelivr特殊处理 else - url="$(grep "$url_id" "$CRASHDIR"/configs/servers.list | awk '{print $3}')/$release_type/$2" + url="$(grep "$url_id" "$CRASHDIR"/configs/servers.list | awk '{print $3}')/$rt/$2" fi else url="$update_url/$2" diff --git a/scripts/starts/afstart.sh b/scripts/starts/afstart.sh index 222ea2d9..aab89dfd 100644 --- a/scripts/starts/afstart.sh +++ b/scripts/starts/afstart.sh @@ -55,6 +55,7 @@ if [ -n "$test" -o -n "$(pidof CrashCore)" ]; then setsid sh "$CRASHDIR/menus/bot_tg.sh" & echo $! > "$TMPDIR/bot_tg.pid" } + exit 0 else . "$CRASHDIR"/starts/start_error.sh "$CRASHDIR"/start.sh stop diff --git a/version b/version index 850c0d08..0c273d95 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.9.4alpha2.1 +1.9.4alpha2.2