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

~bug fix

Browse Source
This commit is contained in:
juewuy
2026-01-20 21:09:07 +08:00
parent 496467332a
commit 8902a742a2
5 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
scripts/menus/2_settings.sh
View File

@@ -17,7 +17,7 @@ settings() {
echo "-----------------------------------------------"
echo -e "\033[30;47m$SET_MENU_TITLE\033[0m"
echo "-----------------------------------------------"
echo -e " 1 $SET_MENU_REDIR\t\033[36m$redir_mod\033[0m"
echo -e " 1 $SET_MENU_REDIR\t\033[36m$redir_mod$MENU_MOD\033[0m"
echo -e " 2 $SET_MENU_DNS\t\033[36m$dns_mod\033[0m"
echo -e " 3 $SET_MENU_FW_FILTER"
[ "$disoverride" != "1" ] && {
@@ -181,10 +181,11 @@ set_redir_mod() {
while true; do
[ -n "$(ls /dev/net/tun 2>/dev/null)" ] || ip tuntap >/dev/null 2>&1 || modprobe tun 2>/dev/null && sup_tun=1
[ -z "$firewall_area" ] && firewall_area=1
[ "$firewall_area" = 4 ] && redir_mod="$MENU_PURE_MOD"
[ -z "$redir_mod" ] && redir_mod='Redir'
firewall_area_dsc=$(echo "$SET_FW_AREA_DESC($bypass_host)" | cut -d'|' -f$firewall_area)
echo "-----------------------------------------------"
echo -e "$SET_REDIR_CURRENT \033[47;30m$redir_mod\033[0m ; $SET_CORE_CURRENT \033[47;30m$crashcore\033[0m"
echo -e "$SET_REDIR_CURRENT \033[47;30m$redir_mod$MENU_MOD\033[0m; $SET_CORE_CURRENT \033[47;30m$crashcore\033[0m"
echo -e "\033[33m$SET_REDIR_RESTART_HINT\033[0m"
echo "-----------------------------------------------"
[ $firewall_area -le 3 ] && {
@@ -460,12 +461,14 @@ set_firewall_area() {
case "$num" in
[1-4])
[ $firewall_area -ge 4 ] && {
redir_mod=Redir
setconfig redir_mod $redir_mod
}
firewall_area=$num
setconfig firewall_area $firewall_area
if [ $firewall_area -ge 4 ];then
redir_mod=''
else
redir_mod=Redir
fi
firewall_area="$num"
setconfig firewall_area "$firewall_area"
setconfig redir_mod "$redir_mod"
;;
5)
echo "-----------------------------------------------"

7
scripts/menus/9_upgrade.sh
View File

@@ -679,7 +679,7 @@ getgeo() {
[ ! -d "$BINDIR"/ruleset ] && mkdir -p "$BINDIR"/ruleset
}
if echo "$geoname" | grep -Eq '.tar.gz'; then
tar -zxf "$TMPDIR"/"${geoname}" "${tar_para}" -C "$BINDIR"/"${geofile}" >/dev/null
tar -zxf "$TMPDIR"/"${geoname}" ${tar_para} -C "$BINDIR"/"${geofile}" >/dev/null
if [ $? -ne 0 ]; then
content_line "文件解压失败！"
separator_line "="
@@ -975,7 +975,7 @@ getdb() {
else
content_line "\033[33m下载成功，正在解压文件......\033[0m"
mkdir -p "$dbdir" >/dev/null
tar -zxf "$TMPDIR/clashdb.tar.gz" "${tar_para}" -C "$dbdir" >/dev/null
tar -zxf "$TMPDIR/clashdb.tar.gz" ${tar_para} -C "$dbdir" >/dev/null
if [ $? -ne 0 ]; then
content_line "文件解压失败！"
separator_line "="
@@ -1079,14 +1079,11 @@ setdb() {
content_line "1) 安装\033[32mzashboard面板\033[0m（约2.2mb）"
content_line "2) 安装\033[32mMetaXD面板\033[0m（约1.5mb）"
content_line "3) 安装\033[32mYacd-Meta魔改面板\033[0m（约1.7mb）"
content_line ""
content_line " - - - - - -已停止维护- - - - - -"
content_line "4) 安装\033[32m基础面板\033[0m（约500kb）"
content_line "5) 安装\033[32mMeta基础面板\033[0m（约800kb）"
content_line "6) 安装\033[32mYacd面板\033[0m（约1.1mb）"
content_line ""
content_line "9) \033[31m卸载本地面板\033[0m"
content_line ""
content_line "0) 返回上级菜单"
separator_line "="