From ed7cb85ee365c36cf4114a4dff584d0af46618c9 Mon Sep 17 00:00:00 2001
From: Junling Bu <linlinjavaer@gmail.com>
Date: Tue, 4 Feb 2020 12:37:37 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E5=88=A9=E7=94=A8tr=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=E6=8A=8Abin=E7=9B=AE=E5=BD=95=E4=B8=8B=E8=84=9A=E6=9C=AC?=
 =?UTF-8?q?=E5=88=86=E8=A1=8C=E6=A0=BC=E5=BC=8F=E4=BB=8ECRLF=E6=94=B9?=
 =?UTF-8?q?=E6=88=90LF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy/util/lazy.sh | 7 +++++--
 docker/util/lazy.sh | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/deploy/util/lazy.sh b/deploy/util/lazy.sh
index a8eebdb0..d7ce630c 100644
--- a/deploy/util/lazy.sh
+++ b/deploy/util/lazy.sh
@@ -38,8 +38,11 @@ cd $LITEMALL_HOME || exit 2
 scp -i $ID_RSA -r  ./deploy $REMOTE:/home/ubuntu/
 
 # 远程登录云服务器并执行reset脚本
+# 这里使用tr命令，因为有可能deploy.sh和reset.sh的换行格式是CRLF，而LINUX环境应该是LF
 ssh $REMOTE -i $ID_RSA << eeooff
-cd /home/ubuntu
-sudo ./deploy/bin/reset.sh
+cd /home/ubuntu/deploy/bin
+cat deploy.sh | tr -d '\r' > deploy.sh
+cat reset.sh | tr -d '\r' > reset.sh
+sudo ./reset.sh
 exit
 eeooff
\ No newline at end of file
diff --git a/docker/util/lazy.sh b/docker/util/lazy.sh
index 570642de..edde1832 100644
--- a/docker/util/lazy.sh
+++ b/docker/util/lazy.sh
@@ -38,8 +38,11 @@ cd $LITEMALL_HOME || exit 2
 scp -i $ID_RSA -r  ./docker $REMOTE:/home/ubuntu/
 
 # 远程登录云服务器并执行reset脚本
+# 这里使用tr命令，因为有可能deploy.sh和reset.sh的换行格式是CRLF，而LINUX环境应该是LF
 ssh $REMOTE -i $ID_RSA << eeooff
-cd /home/ubuntu
-sudo ./docker/bin/reset.sh
+cd /home/ubuntu/docker/bin
+cat deploy.sh | tr -d '\r' > deploy.sh
+cat reset.sh | tr -d '\r' > reset.sh
+sudo ./reset.sh
 exit
 eeooff
\ No newline at end of file