From ce7a4812a2ccb1bbf73676794777b67008c0fd41 Mon Sep 17 00:00:00 2001 From: bin456789 Date: Sun, 8 Oct 2023 22:01:34 +0800 Subject: [PATCH] =?UTF-8?q?core:=20=E4=BF=AE=E5=A4=8D=E4=BB=8E=20Windows?= =?UTF-8?q?=20=E4=B8=8B=E8=8E=B7=E5=8F=96=E7=9A=84=20IP=20=E5=90=AB?= =?UTF-8?q?=E6=9C=89=E5=A4=9A=E4=BD=99=E7=9A=84=E6=8D=A2=E8=A1=8C=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- reinstall.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/reinstall.sh b/reinstall.sh index d15e5cc..fb3bdd4 100644 --- a/reinstall.sh +++ b/reinstall.sh @@ -726,7 +726,8 @@ collect_netconf() { powershell -nologo -noprofile -NonInteractive \ -ExecutionPolicy bypass \ -File "$ps1" | - sed 's/://' + sed 's/://' | + sed 's/\r//' # 删除 windows \r 换行符 ) mac_addr=$(echo_conf MACAddress) ipv4_addr=$(echo_conf IPAddress4)