From 1512e7b1755c380a6f617bab0a59d6573d8b5b59 Mon Sep 17 00:00:00 2001
From: juewuy <juewuy@126.com>
Date: Tue, 22 Jun 2021 11:29:49 +0800
Subject: [PATCH] =?UTF-8?q?v1.4.0-pre-release=20~=E9=80=82=E9=85=8D?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8ax18=E7=AD=89=E4=BD=8E=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=86=85=E6=A0=B8=E8=AE=BE=E5=A4=87=20~=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=9C=AC=E6=9C=BADocker=E4=BB=A3=E7=90=86(?=
 =?UTF-8?q?=E9=9C=80docker=E7=BD=91=E5=8D=A1=E8=AE=BE=E7=BD=AE=E4=B8=BAbri?=
 =?UTF-8?q?dge=E6=A8=A1=E5=BC=8F)=20~=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E5=85=AC=E7=BD=91=E8=AE=BF=E9=97=AEDashboard=E9=9D=A2=E6=9D=BF?=
 =?UTF-8?q?=E5=8F=8A=E6=B7=B7=E5=90=88=E4=BB=A3=E7=90=86=E7=AB=AF=E5=8F=A3?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=20~=E5=A2=9E=E5=8A=A0clash=20-u=E5=8D=B8?=
 =?UTF-8?q?=E8=BD=BD=E5=91=BD=E4=BB=A4=20~=E4=BC=98=E5=8C=96=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E6=9C=BA=E5=88=B6=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=87=BA?=
 =?UTF-8?q?=E9=94=99bug=20~=E4=BC=98=E5=8C=96=E5=AE=89=E8=A3=85=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=8A=E5=AE=89=E8=A3=85=E8=AF=B4=E6=98=8E=20~?=
 =?UTF-8?q?=E5=B1=80=E5=9F=9F=E7=BD=91=E8=BF=87=E6=BB=A4=E9=BB=91=E7=99=BD?=
 =?UTF-8?q?=E5=90=8D=E5=8D=95=E6=8F=8F=E8=BF=B0=E4=BC=98=E5=8C=96=20~?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=A0=E5=AF=86DNS=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E9=85=8D=E7=BD=AE=E7=9A=84bug=20~=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E4=BF=9D=E5=AD=98=E8=AE=BE=E7=BD=AE=E6=97=B6=E9=83=A8?=
 =?UTF-8?q?=E5=88=86bug=20~=E7=89=88=E6=9C=AC=E5=8F=8A=E5=AE=89=E8=A3=85?=
 =?UTF-8?q?=E6=BA=90=E6=8F=8F=E8=BF=B0=E4=BC=98=E5=8C=96=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0HTTP=E4=B8=93=E5=B1=9E=E6=BA=90=EF=BC=88=E6=84=9F?=
 =?UTF-8?q?=E8=B0=A2=E9=85=B1=E7=B4=AB=E8=A1=A8=E5=90=8C=E5=AD=A6=E6=8F=90?=
 =?UTF-8?q?=E4=BE=9B=E6=9C=8D=E5=8A=A1=E5=99=A8=EF=BC=81=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/getdate.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/scripts/getdate.sh b/scripts/getdate.sh
index 07c68fb..8ecf255 100644
--- a/scripts/getdate.sh
+++ b/scripts/getdate.sh
@@ -878,6 +878,14 @@ userguide(){
 			forwhat
 		elif [ "$num" = 1 ];then
 			whichmod
+			#检测IP转发
+			if [ "$(cat /proc/sys/net/ipv4/ip_forward)" = "0" ];then
+				echo -----------------------------------------------
+				echo -e "\033[33m检测到你的设备尚未开启ip转发，局域网设备将无法正常连接网络，是否立即开启？\033[0m"
+				read -p "是否开启？(1/0) > " res
+				[ "$res" = 1 ] && echo 'net.ipv4.ip_forward = 1' >> /etc/sysctl.conf
+				[ "$?" = 0 ] && /etc/init.d/procps restart && echo "已成功开启ipv4转发，如未正常开启，请手动重启设备！" || echo "开启失败！请自行谷歌查找当前设备的开启方法！"
+			fi
 		elif [ "$num" = 2 ];then
 			setconfig redir_mod "纯净模式"
 			setconfig clashcore "clash"
@@ -899,13 +907,6 @@ userguide(){
 		fi
 	}
 	forwhat
-	#检测IP转发
-	if [ "$(cat /proc/sys/net/ipv4/ip_forward)" = "0" ];then
-		echo -----------------------------------------------
-		echo -e "\033[33m检测到你的设备尚未开启ip转发，局域网设备将无法正常连接网络，是否立即开启？\033[0m"
-		read -p "是否开启？(1/0) > " res
-		[ "$res" = 1 ] && echo 'net.ipv4.ip_forward = 1' >> /etc/sysctl.conf && /etc/init.d/procps restart && echo "已成功开启ipv4转发，如未正常开启，请手动重启设备！"
-	fi
 	#检测小内存模式
 	dir_size=$(df $clashdir | awk '{print $4}' | sed 1d)
 	if [ "$dir_size" -lt 10240 ];then