From 73c938ebbc6bd7e7cc5b8c0cdda95dfae59eceea Mon Sep 17 00:00:00 2001 From: Junling Bu Date: Sun, 9 Feb 2020 23:58:22 +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=8EC=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 | 8 ++++++-- docker/util/lazy.sh | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/deploy/util/lazy.sh b/deploy/util/lazy.sh index d7ce630c..04646e63 100644 --- a/deploy/util/lazy.sh +++ b/deploy/util/lazy.sh @@ -41,8 +41,12 @@ scp -i $ID_RSA -r ./deploy $REMOTE:/home/ubuntu/ # 这里使用tr命令,因为有可能deploy.sh和reset.sh的换行格式是CRLF,而LINUX环境应该是LF ssh $REMOTE -i $ID_RSA << eeooff cd /home/ubuntu/deploy/bin -cat deploy.sh | tr -d '\r' > deploy.sh -cat reset.sh | tr -d '\r' > reset.sh +cat deploy.sh | tr -d '\r' > deploy2.sh +mv deploy2.sh deploy.sh +chmod +x deploy.sh +cat reset.sh | tr -d '\r' > reset2.sh +mv reset2.sh reset.sh +chmod +x 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 edde1832..2ac2bd3c 100644 --- a/docker/util/lazy.sh +++ b/docker/util/lazy.sh @@ -41,8 +41,12 @@ scp -i $ID_RSA -r ./docker $REMOTE:/home/ubuntu/ # 这里使用tr命令,因为有可能deploy.sh和reset.sh的换行格式是CRLF,而LINUX环境应该是LF ssh $REMOTE -i $ID_RSA << eeooff cd /home/ubuntu/docker/bin -cat deploy.sh | tr -d '\r' > deploy.sh -cat reset.sh | tr -d '\r' > reset.sh +cat deploy.sh | tr -d '\r' > deploy2.sh +mv deploy2.sh deploy.sh +chmod +x deploy.sh +cat reset.sh | tr -d '\r' > reset2.sh +mv reset2.sh reset.sh +chmod +x reset.sh sudo ./reset.sh exit eeooff \ No newline at end of file