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