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

~致谢列表更新

Browse Source 
~部分文字描述调整
This commit is contained in:
juewuy
2024-02-04 18:30:58 +08:00
parent a7c58d0712
commit 0f01e92c08
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/getdate.sh
View File

@@ -1779,14 +1779,13 @@ update(){
elif [ "$num" = 99 ]; then elif [ "$num" = 99 ]; then
echo ----------------------------------------------- echo -----------------------------------------------
echo -e "感谢：\033[32mClash项目 \033[0m作者\033[36m Dreamacro\033[0m 项目地址：\033[32mhttps://github.com/Dreamacro/clash\033[0m" echo -e "感谢：\033[32mClash项目 \033[0m作者\033[36m Dreamacro\033[0m"
echo -e "感谢：\033[32mClash.meta项目 \033[0m作者\033[36m MetaCubeX\033[0m 项目地址：\033[32mhttps://github.com/MetaCubeX/Clash.Meta\033[0m" echo -e "感谢：\033[32msing-box项目 \033[0m作者\033[36m SagerNet\033[0m 项目地址：\033[32mhttps://github.com/SagerNet/sing-box\033[0m"
echo -e "感谢：\033[32mMetaCubeX项目 \033[0m作者\033[36m MetaCubeX\033[0m 项目地址：\033[32mhttps://github.com/MetaCubeX\033[0m"
echo -e "感谢：\033[32mYACD面板项目 \033[0m作者\033[36m haishanh\033[0m 项目地址：\033[32mhttps://github.com/haishanh/yacd\033[0m" echo -e "感谢：\033[32mYACD面板项目 \033[0m作者\033[36m haishanh\033[0m 项目地址：\033[32mhttps://github.com/haishanh/yacd\033[0m"
echo -e "感谢：\033[32mSubconverter \033[0m作者\033[36m tindy2013\033[0m 项目地址：\033[32mhttps://github.com/tindy2013/subconverter\033[0m" echo -e "感谢：\033[32mSubconverter \033[0m作者\033[36m tindy2013\033[0m 项目地址：\033[32mhttps://github.com/tindy2013/subconverter\033[0m"
echo -e "感谢：\033[32m由alecthw提供的GeoIP数据库\033[0m 项目地址：\033[32mhttps://github.com/alecthw/mmdb_china_ip_list\033[0m" echo -e "感谢：\033[32msing-box分支项目 \033[0m作者\033[36m PuerNya\033[0m 项目地址：\033[32mhttps://github.com/PuerNya/sing-box\033[0m"
echo -e "感谢：\033[32m由Hackl0us提供的GeoIP精简数据库\033[0m 项目地址：\033[32mhttps://github.com/Hackl0us/GeoIP2-CN\033[0m" echo -e "感谢：\033[32mDustinWin相关项目 \033[0m作者\033[36m DustinWin\033[0m 作者地址：\033[32mhttps://github.com/DustinWin\033[0m"
echo -e "感谢：\033[32m由17mon提供的CN-IP列表\033[0m 项目地址：\033[32mhttps://github.com/17mon/china_ip_list\033[0m"
echo -e "感谢：\033[32m由ChanthMiao提供的CN-IPV6列表\033[0m 项目地址：\033[32mhttps://github.com/ChanthMiao/China-IPv6-List\033[0m"
echo ----------------------------------------------- echo -----------------------------------------------
echo -e "特别感谢：\033[36m所有帮助及赞助过此项目的同仁们！\033[0m" echo -e "特别感谢：\033[36m所有帮助及赞助过此项目的同仁们！\033[0m"
echo ----------------------------------------------- echo -----------------------------------------------

12
scripts/menu.sh
View File

@@ -867,7 +867,7 @@ macfilter(){ #局域网设备过滤
###### ######
echo -e "\033[30;47m请在此添加或移除设备\033[0m" echo -e "\033[30;47m请在此添加或移除设备\033[0m"
echo -e "当前过滤方式为：\033[33m$macfilter_type模式\033[0m" echo -e "当前过滤方式为：\033[33m$macfilter_type模式\033[0m"
echo -e "仅列表内设备\033[36m$macfilter_scrip经过\033[0mClash内核" echo -e "仅列表内设备流量\033[36m$macfilter_scrip经过\033[0m内核"
if [ -n "$(cat ${CRASHDIR}/configs/mac)" ]; then if [ -n "$(cat ${CRASHDIR}/configs/mac)" ]; then
echo ----------------------------------------------- echo -----------------------------------------------
echo -e "当前已过滤设备为：\033[36m" echo -e "当前已过滤设备为：\033[36m"
@@ -977,13 +977,13 @@ setboot(){ #启动相关设置
ckcmd systemctl && systemctl disable shellcrash.service > /dev/null 2>&1 ckcmd systemctl && systemctl disable shellcrash.service > /dev/null 2>&1
touch ${CRASHDIR}/.dis_startup touch ${CRASHDIR}/.dis_startup
autostart=disable autostart=disable
echo -e "\033[33m已禁止Clash开机启动！\033[0m" echo -e "\033[33m已禁止ShellCrash开机启动！\033[0m"
elif [ "$autostart" = "disable" ]; then elif [ "$autostart" = "disable" ]; then
[ -f /etc/rc.common -a "$(cat /proc/1/comm)" = "procd" ] && /etc/init.d/shellcrash enable [ -f /etc/rc.common -a "$(cat /proc/1/comm)" = "procd" ] && /etc/init.d/shellcrash enable
ckcmd systemctl && systemctl enable shellcrash.service > /dev/null 2>&1 ckcmd systemctl && systemctl enable shellcrash.service > /dev/null 2>&1
rm -rf ${CRASHDIR}/.dis_startup rm -rf ${CRASHDIR}/.dis_startup
autostart=enable autostart=enable
echo -e "\033[32m已设置Clash开机启动！\033[0m" echo -e "\033[32m已设置ShellCrash开机启动！\033[0m"
fi fi
setboot setboot
;; ;;
@@ -1119,7 +1119,7 @@ normal_set(){ #基础设置
[ -n "$(ls /dev/net/tun)" ] || ip tuntap >/dev/null 2>&1 && sup_tun=1 [ -n "$(ls /dev/net/tun)" ] || ip tuntap >/dev/null 2>&1 && sup_tun=1
nft add table inet shellcrash 2>/dev/null && sup_nft=1 && modprobe nft_tproxy >/dev/null 2>&1 && sup_nft=2 nft add table inet shellcrash 2>/dev/null && sup_nft=1 && modprobe nft_tproxy >/dev/null 2>&1 && sup_nft=2
echo ----------------------------------------------- echo -----------------------------------------------
echo -e "当前代理模式为：\033[47;30m $redir_mod \033[0m；Clash核心为：\033[47;30m $crashcore \033[0m" echo -e "当前代理模式为：\033[47;30m $redir_mod \033[0m；ShellCrash核心为：\033[47;30m $crashcore \033[0m"
echo -e "\033[33m切换模式后需要手动重启服务以生效！\033[0m" echo -e "\033[33m切换模式后需要手动重启服务以生效！\033[0m"
echo ----------------------------------------------- echo -----------------------------------------------
ckcmd iptables && echo -e " 1 \033[32mRedir模式\033[0m： Redir转发TCP，不转发UDP" ckcmd iptables && echo -e " 1 \033[32mRedir模式\033[0m： Redir转发TCP，不转发UDP"
@@ -1290,7 +1290,7 @@ normal_set(){ #基础设置
echo ----------------------------------------------- echo -----------------------------------------------
echo -e "\033[30;47m欢迎使用功能设置菜单：\033[0m" echo -e "\033[30;47m欢迎使用功能设置菜单：\033[0m"
echo ----------------------------------------------- echo -----------------------------------------------
echo -e " 1 切换Clash运行模式: \033[36m$redir_mod\033[0m" echo -e " 1 切换防火墙运行模式: \033[36m$redir_mod\033[0m"
[ "$disoverride" != "1" ] && { [ "$disoverride" != "1" ] && {
echo -e " 2 切换DNS运行模式： \033[36m$dns_mod\033[0m" echo -e " 2 切换DNS运行模式： \033[36m$dns_mod\033[0m"
echo -e " 3 跳过本地证书验证： \033[36m$skip_cert\033[0m ————解决节点证书验证错误" echo -e " 3 跳过本地证书验证： \033[36m$skip_cert\033[0m ————解决节点证书验证错误"
@@ -1834,7 +1834,7 @@ main_menu(){
${CRASHDIR}/start.sh stop ${CRASHDIR}/start.sh stop
sleep 1 sleep 1
echo ----------------------------------------------- echo -----------------------------------------------
echo -e "\033[31mClash服务已停止！\033[0m" echo -e "\033[31m$corename服务已停止！\033[0m"
main_menu main_menu
elif [ "$num" = 4 ]; then elif [ "$num" = 4 ]; then

2
scripts/start.sh
View File

@@ -1529,6 +1529,7 @@ core_check(){ #检查及下载内核文件
fi fi
} }
[ ! -x ${TMPDIR}/CrashCore ] && chmod +x ${TMPDIR}/CrashCore 2>/dev/null #自动授权 [ ! -x ${TMPDIR}/CrashCore ] && chmod +x ${TMPDIR}/CrashCore 2>/dev/null #自动授权
[ "$start_old" != "已开启" -a "$(cat /proc/1/comm)" = "systemd" ] && restorecon -RF $CRASHDIR 2>/dev/null #修复SELinux权限问题
return 0 return 0
} }
clash_check(){ #clash启动前检查 clash_check(){ #clash启动前检查
@@ -1629,7 +1630,6 @@ bfstart(){ #启动前
echo "shellcrash:x:0:7890:::" >> /etc/passwd echo "shellcrash:x:0:7890:::" >> /etc/passwd
fi fi
} }
[ "$start_old" != "已开启" -a "$(cat /proc/1/comm)" = "systemd" ] && ckcmd restorecon && restorecon -rv $CRASHDIR 2>/dev/null #修复selinux权限问题
#清理debug日志 #清理debug日志
rm -rf ${TMPDIR}/debug.log rm -rf ${TMPDIR}/debug.log
return 0 return 0