[pull] dev from juewuy:dev

scripts/init.sh

@@ -177,53 +177,38 @@ mv -f /tmp/SC_tmp/* ${CRASHDIR} 2>/dev/null
 mkdir -p ${CRASHDIR}/configs
 [ -f "${CRASHDIR}/configs/ShellCrash.cfg" ] || echo '#ShellCrash配置文件，不明勿动！' >${CRASHDIR}/configs/ShellCrash.cfg
 #判断系统类型写入不同的启动文件
+[ -w /usr/lib/systemd/system ] && sysdir=/usr/lib/systemd/system
+[ -w /etc/systemd/system ] && sysdir=/etc/systemd/system
 if [ -f /etc/rc.common -a "$(cat /proc/1/comm)" = "procd" ]; then
 	#设为init.d方式启动
 	cp -f ${CRASHDIR}/shellcrash.procd /etc/init.d/shellcrash
 	chmod 755 /etc/init.d/shellcrash
-else
-	[ -w /usr/lib/systemd/system ] && sysdir=/usr/lib/systemd/system
-	[ -w /etc/systemd/system ] && sysdir=/etc/systemd/system
-	if [ -n "$sysdir" -a "$USER" = "root" -a "$(cat /proc/1/comm)" = "systemd" ]; then
-		#创建shellcrash用户
-		userdel shellcrash 2>/dev/null
-		sed -i '/0:7890/d' /etc/passwd
-		sed -i '/x:7890/d' /etc/group
-		if useradd -h >/dev/null 2>&1; then
-			useradd shellcrash -u 7890 2>/dev/null
-			sed -Ei s/7890:7890/0:7890/g /etc/passwd
-		else
-			echo "shellcrash:x:0:7890::/home/shellcrash:/bin/sh" >>/etc/passwd
-		fi
-		#配置systemd
-		mv -f ${CRASHDIR}/shellcrash.service $sysdir/shellcrash.service 2>/dev/null
-		sed -i "s%/etc/ShellCrash%$CRASHDIR%g" $sysdir/shellcrash.service
-		rm -rf $sysdir/clash.service #旧版文件清理
-		systemctl daemon-reload
+	rm -rf ${CRASHDIR}/shellcrash.openrc
+elif [ -n "$sysdir" -a "$USER" = "root" -a "$(cat /proc/1/comm)" = "systemd" ]; then
+	#创建shellcrash用户
+	userdel shellcrash 2>/dev/null
+	sed -i '/0:7890/d' /etc/passwd
+	sed -i '/x:7890/d' /etc/group
+	if useradd -h >/dev/null 2>&1; then
+		useradd shellcrash -u 7890 2>/dev/null
+		sed -Ei s/7890:7890/0:7890/g /etc/passwd
 	else
-		#设为保守模式启动
-		systemctl disable shellcrash 2>/dev/null
-		setconfig start_old 已开启
+		echo "shellcrash:x:0:7890::/home/shellcrash:/bin/sh" >>/etc/passwd
 	fi
+	#配置systemd
+	mv -f ${CRASHDIR}/shellcrash.service $sysdir/shellcrash.service 2>/dev/null
+	sed -i "s%/etc/ShellCrash%$CRASHDIR%g" $sysdir/shellcrash.service
+	systemctl daemon-reload
+elif rc-status -r >/dev/null 2>&1; then	
+	#设为openrc方式启动
+	cp -f ${CRASHDIR}/shellcrash.openrc /etc/init.d/shellcrash
+	chmod 755 /etc/init.d/shellcrash
+	rm -rf ${CRASHDIR}/shellcrash.procd
+else
+	#设为保守模式启动
+	setconfig start_old 已开启
 fi
 
-# 在此处添加Alpine OpenRC配置（约第220-230行附近）
-# Alpine Linux (OpenRC) 自启动配置
-if [ -f "/sbin/openrc" ] && [ "$(cat /proc/1/comm)" = "init" ]; then
-    # 创建启动脚本
-    if [ ! -f "/etc/local.d/shellcrash.start" ]; then
-        echo "#!/bin/sh" > /etc/local.d/shellcrash.start
-        echo "${CRASHDIR}/start.sh start &" >> /etc/local.d/shellcrash.start
-        chmod +x /etc/local.d/shellcrash.start
-    fi
-    # 添加到默认运行级别
-    rc-update add local default >/dev/null 2>&1
-    setconfig autostart "enable"
-    logger "已配置Alpine系统自启动" 32
-fi
-
-
-
 #修饰文件及版本号
 command -v bash >/dev/null 2>&1 && shtype=bash
 [ -x /bin/ash ] && shtype=ash
@@ -232,7 +217,7 @@ for file in start.sh task.sh menu.sh; do
 	chmod 755 ${CRASHDIR}/${file}
 done
 setconfig versionsh_l $version
-#生成用于执行systemd及procd服务的变量文件
+#生成用于执行启动服务的变量文件
 [ ! -f ${CRASHDIR}/configs/command.env ] && {
 	TMPDIR='/tmp/ShellCrash'
 	BINDIR=${CRASHDIR}
@@ -351,7 +336,7 @@ sed -i '/shellclash/d' /etc/group
 rm -rf /etc/init.d/clash
 rm -rf ${CRASHDIR}/rules
 [ "$systype" = "mi_snapshot" -a "$CRASHDIR" != '/data/clash' ] && rm -rf /data/clash
-for file in CrashCore clash.sh getdate.sh shellcrash.rc core.new clashservice log shellcrash.service mark? mark.bak; do
+for file in CrashCore clash.sh getdate.sh core.new clashservice log shellcrash.service mark? mark.bak; do
 	rm -rf ${CRASHDIR}/$file
 done
 #旧版变量改名

scripts/menu.sh

@@ -63,6 +63,8 @@ ckstatus() {
 		[ -n "$(find /etc/rc.d -name '*shellcrash')" ] && autostart=enable || autostart=disable
 	elif ckcmd systemctl; then
 		[ "$(systemctl is-enabled shellcrash.service 2>&1)" = enabled ] && autostart=enable || autostart=disable
+	elif rc-status -r >/dev/null 2>&1; then
+		rc-update show default | grep -q "shellcrash" && autostart=enable || autostart=disable
 	else
 		[ -f ${CRASHDIR}/.dis_startup ] && autostart=disable || autostart=enable
 	fi
@@ -1169,7 +1171,7 @@ setboot() { #启动相关设置
 	echo -----------------------------------------------
 	echo -e "\033[30;47m欢迎使用启动设置菜单：\033[0m"
 	echo -----------------------------------------------
-	echo -e " 1 ${auto_set}\033[0mShellCrash开机启动(alpine需先禁用再启用)"
+	echo -e " 1 ${auto_set}\033[0mShellCrash开机启动"
 	echo -e " 2 使用保守模式:	\033[36m$start_old\033[0m	————基于定时任务(每分钟检测)"
 	echo -e " 3 设置自启延时:	\033[36m$delay\033[0m	————用于解决自启后服务受限"
 	echo -e " 4 启用小闪存模式:	\033[36m$mini_clash\033[0m	————用于闪存空间不足的设备"
@@ -1186,24 +1188,15 @@ setboot() { #启动相关设置
 			# 禁止自启动：删除各系统的启动项
 			[ -d /etc/rc.d ] && cd /etc/rc.d && rm -rf *shellcrash >/dev/null 2>&1 && cd - >/dev/null
 			ckcmd systemctl && systemctl disable shellcrash.service >/dev/null 2>&1
-			# 新增：删除Alpine的启动脚本
-			[ -f "/sbin/openrc" ] && rm -f /etc/local.d/shellcrash.start
+			[rc-status -r >/dev/null 2>&1 && rc-update del shellcrash default >/dev/null
 			touch ${CRASHDIR}/.dis_startup
 			autostart=disable
 			echo -e "\033[33m已禁止ShellCrash开机启动！\033[0m"
 		elif [ "$autostart" = "disable" ]; then
 			# 允许自启动：配置各系统的启动项
 			[ -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
-			# 新增：配置Alpine的启动脚本
-			if [ -f "/sbin/openrc" ]; then
-				[ ! -f "/etc/local.d/shellcrash.start" ] && {
-					echo "#!/bin/sh" > /etc/local.d/shellcrash.start
-					echo "${CRASHDIR}/start.sh start &" >> /etc/local.d/shellcrash.start
-					chmod +x /etc/local.d/shellcrash.start
-				}
-				rc-update add local default >/dev/null 2>&1
-			fi
+			rc-status -r >/dev/null 2>&1 && rc-update add shellcrash default >/dev/null
 			rm -rf ${CRASHDIR}/.dis_startup
 			autostart=enable
 			echo -e "\033[32m已设置ShellCrash开机启动！\033[0m"
@@ -1219,7 +1212,7 @@ setboot() { #启动相关设置
 			setconfig start_old $start_old
 			${CRASHDIR}/start.sh stop
 		else
-			if [ "$(cat /proc/1/comm)" = "procd" -o "$(cat /proc/1/comm)" = "systemd" ]; then
+			if grep -qE 'procd|systemd' /proc/1/comm || rc-status -r >/dev/null 2>&1; then
 				echo -e "\033[32m改为使用系统守护进程启动服务！！\033[0m"
 				${CRASHDIR}/start.sh cronset "ShellCrash初始化"
 				start_old=未开启
@@ -2060,7 +2053,7 @@ tools() {
 	[ -f /etc/firewall.user ] && echo -e " 4 \033[32m配置\033[0m外网访问SSH"
 	[ -x /usr/sbin/otapredownload ] && echo -e " 5 \033[33m$mi_update\033[0m小米系统自动更新"
 	[ "$systype" = "mi_snapshot" ] && echo -e " 6 小米设备软固化SSH ———— \033[$mi_autoSSH_type \033[0m"
-	[ -d /etc/ddns ] && echo -e " 7 配置\033[32mDDNS服务\033[0m(需下载相关脚本)"
+	[ -f /etc/config/ddns ] && echo -e " 7 配置\033[32mDDNS服务\033[0m(需下载相关脚本)"
 	[ "$systype" = "mi_snapshot" ] && echo -e " 8 小米设备Tun模块修复 ———— \033[$mi_tunfix \033[0m"
 	echo -----------------------------------------------
 	echo -e " 0 返回上级菜单"
@@ -2093,12 +2086,12 @@ tools() {
 			${CRASHDIR}/start.sh get_bin ${TMPDIR}/ShellDDNS.sh tools/ShellDDNS.sh
 			if [ "$?" = "0" ]; then
 				mv -f ${TMPDIR}/ShellDDNS.sh ${CRASHDIR}/tools/ShellDDNS.sh
-				source ${CRASHDIR}/tools/ShellDDNS.sh
+				. ${CRASHDIR}/tools/ShellDDNS.sh
 			else
 				echo -e "\033[31m文件下载失败！\033[0m"
 			fi
 		else
-			source ${CRASHDIR}/tools/ShellDDNS.sh
+			. ${CRASHDIR}/tools/ShellDDNS.sh
 		fi
 		sleep 1
 		tools

scripts/shellcrash.openrc

@@ -0,0 +1,74 @@
+#!/sbin/openrc-run
+
+# 服务名
+name="ShellCrash"
+description="Custom proxy service for ShellCrash"
+#获取目录
+CRASHDIR=$(cat /etc/profile | grep CRASHDIR | awk -F "\"" '{print $2}')
+[ -z "$CRASHDIR" ] && CRASHDIR=$(cat ~/.bashrc | grep CRASHDIR | awk -F "\"" '{print $2}')
+source ${CRASHDIR}/configs/command.env #加载启动命令和启动目录
+
+# PID 文件
+pidfile="/run/shellcrash.pid"
+
+depend() {
+    #need net
+    after firewall
+}
+
+start() {
+    ebegin "Starting ShellCrash service"
+
+    # 如果 firewal_area=5 则运行主旁转发脚本
+    if grep -q 'firewall_area=5' "$CRASHDIR/configs/ShellCrash.cfg" 2>/dev/null; then
+        "$CRASHDIR/start.sh" start_firewall
+        eend $? "Firewall start failed"
+        return
+    fi
+
+    # 确定运行用户：shellcrash 或 root
+    if grep -q 'shellcrash:x:0:7890' /etc/passwd; then
+        runuser="shellcrash"
+    else
+        runuser="root"
+    fi
+
+    # 必要文件检测
+    "$CRASHDIR/start.sh" bfstart
+    if [ "$?" != "0" ]; then
+        eend 1 "bfstart check failed"
+        return
+    fi
+
+    # 启动主程序（后台进程）
+    start-stop-daemon --start \
+        --background \
+        --make-pidfile \
+        --pidfile "${pidfile}" \
+        --user "${runuser}" \
+        --exec ${COMMAND%% *} -- ${COMMAND#* }
+
+    ret=$?
+    eend $ret
+    [ $ret -ne 0 ] && return
+
+    # 启动后操作
+    "$CRASHDIR/start.sh" afstart &
+}
+
+stop() {
+    ebegin "Stopping ShellCrash service"
+
+    # 停止后台进程
+    start-stop-daemon --stop \
+        --pidfile "${pidfile}" \
+        --retry 5
+
+    rm -f "${pidfile}"
+
+    # 清理 firewall、proxy
+    "$CRASHDIR/start.sh" stop_firewall
+    "$CRASHDIR/start.sh" unset_proxy
+
+    eend $?
+}

scripts/start.sh

@@ -2032,6 +2032,8 @@ start)
 			systemctl daemon-reload
 			systemctl start shellcrash.service || start_error
 		}
+	elif rc-status -r >/dev/null 2>&1; then
+		rc-service shellcrash start >/dev/null 2>&1
 	else
 		bfstart && start_old
 	fi
@@ -2052,6 +2054,8 @@ stop)
 		systemctl stop shellcrash.service >/dev/null 2>&1
 	elif [ -f /etc/rc.common -a "$(cat /proc/1/comm)" = "procd" ]; then
 		/etc/init.d/shellcrash stop >/dev/null 2>&1
+	elif rc-status -r >/dev/null 2>&1; then
+		rc-service shellcrash stop >/dev/null 2>&1
 	else
 		stop_firewall #清理路由策略
 		unset_proxy   #禁用本机代理

scripts/webget.sh

@@ -620,8 +620,10 @@ setproviders(){ #自定义providers
 		echo -e "本地配置文件请放在\033[32m$CRASHDIR\033[0m目录下，并填写相对路径如【\033[32m./providers/test.yaml\033[0m】"
 		echo -----------------------------------------------
 		read -p "请输入providers订阅地址或本地相对路径 > " link
+		link=$(${link// /})
 		[ -n "$(echo $link | grep -E '.*\..*|^\./')" ] && {
 			read -p "请输入代理服务商的名称或者代号(不可重复) > " name
+			name=$(${name// /})
 			[ -n "$name" ] && [ -z "$(grep "name" $CRASHDIR/configs/providers.cfg)" ] && {
 				echo -----------------------------------------------
 				echo -e "代理服务商：\033[36m$name\033[0m"

tools/ShellDDNS.sh

@@ -4,7 +4,7 @@
 ddns_dir=/etc/config/ddns
 tmp_dir=/tmp/ddns_$USER
 
-[ ! -d $ddns_dir -o ! -d /etc/ddns ] && echo -e "本脚本依赖OpenWrt内置的DDNS服务,当前设备无法运行,已退出！" && exit 1
+[ ! -f $ddns_dir ] && echo -e "本脚本依赖OpenWrt内置的DDNS服务,当前设备无法运行,已退出！" && exit 1
 echo -----------------------------------------------
 echo -e "\033[30;46m欢迎使用ShellDDNS！\033[0m"
 echo -e "TG群：\033[36;4mhttps://t.me/ShellCrash\033[0m"
@@ -22,10 +22,12 @@ config service '$service'
 	option use_ipv6 '$use_ipv6'
 	option password '$password'
 	option ip_source 'web'
+	option ip_url 'http://ip.sb'
 	option check_unit 'minutes'
 	option check_interval '$check_interval'
 	option force_interval '$force_interval'
 	option interface 'wan'
+	option bind_network 'wan'
 EOF
 	/usr/lib/ddns/dynamic_dns_updater.sh -S $service start >/dev/null 2>&1 &
 	sleep 3
@@ -59,17 +61,23 @@ set_ddns() {
 }
 
 set_service() {
-	services_dir=/etc/ddns/$services
+	services_dir=/etc/ddns/$services 
+	if [ -s $services_dir ];then
+		row=2
+	else
+		services_dir=/usr/share/ddns/list
+		row=1
+	fi
 	echo -----------------------------------------------
 	echo -e "\033[32m请选择服务提供商\033[0m"
-	cat $services_dir | grep -v '^#' | awk -F "[\"]" '{print " "NR" " $2}'
+	cat $services_dir | grep -v '^#' | awk -F "[\"]" -v i="$row" '{print " "NR" " $i}'
 	nr=$(cat $services_dir | grep -v '^#' | wc -l)
 	read -p "请输入对应数字 > " num
 	if [ -z "$num" ]; then
 		i=
 	elif [ "$num" -gt 0 -a "$num" -lt $nr ]; then
-		service=$(cat $services_dir | grep -v '^#' | awk -F "[\".]" '{print $2}' | sed -n "$num"p)
-		service_name=$(cat $services_dir | grep -v '^#' | awk -F "[\"]" '{print $2}' | sed -n "$num"p)
+		service=$(cat $services_dir | grep -v '^#' | awk -F "[\".]" -v i="$row" '{print " "NR" " $i}' | sed -n "$num"p)
+		service_name=$(cat $services_dir | grep -v '^#' | awk -F "[\"]" -v i="$row" '{print " "NR" " $i}' | sed -n "$num"p)
 		set_ddns
 	else
 		echo "输入错误，请重新输入！"
@@ -144,7 +152,7 @@ load_ddns() {
 		nr=$((nr + 1))
 		enabled=$(uci show ddns.$service 2>/dev/null | grep 'enabled' | awk -F "=" '{print $2}' | tr -d "'\"")
 		domain=$(uci show ddns.$service 2>/dev/null | grep 'domain' | awk -F "=" '{print $2}' | tr -d "'\"")
-		local_ip=$(cat /var/log/ddns/$service.log 2>/dev/null | grep 'Local IP' | tail -1 | awk -F "=" '{print $2}' | tr -d "'\"")
+		local_ip=$(sed '1!G;h;$!d' /var/log/ddns/$service.log 2>/dev/null | grep -E 'Update successful - IP' | tail -1 | awk -F "'" '{print $2}' | tr -d "'\"")
 		echo -e " $nr   $domain  $enabled   $local_ip"
 	done
 	echo -e " $((nr + 1))   添加DDNS服务"