Browse Source

chore: 利用tr命令把bin目录下脚本分行格式从CRLF改成LF

Junling Bu 5 years ago
parent
commit
ed7cb85ee3
2 changed files with 10 additions and 4 deletions
  1. 5 2
      deploy/util/lazy.sh
  2. 5 2
      docker/util/lazy.sh

+ 5 - 2
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

+ 5 - 2
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