From c04bf4866447ad2762f4a0a5b8ab2052ea98b9be Mon Sep 17 00:00:00 2001
From: Junling Bu <linlinjavaer@gmail.com>
Date: Sat, 27 Jul 2019 15:42:03 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E5=88=A9=E7=94=A8ShellCheck=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9sh=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy/bin/reset.sh |  8 ++++----
 deploy/util/lazy.sh | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/deploy/bin/reset.sh b/deploy/bin/reset.sh
index e6bc8e21..d486e4a6 100644
--- a/deploy/bin/reset.sh
+++ b/deploy/bin/reset.sh
@@ -15,17 +15,17 @@ PASSWORD=
 if test -z "$PASSWORD"
 then
   echo "请设置云主机MySQL的root账号密码"
-  exit -1
+  exit 1
 fi
 
 # 导入数据
-cd /home/ubuntu/deploy/db
+cd /home/ubuntu/deploy/db || exit 2
 mysql -h localhost -u $ROOT -p$PASSWORD < litemall.sql
 
 # 删除storage文件夹内文件
-cd /home/ubuntu/deploy/litemall/storage
+cd /home/ubuntu/deploy/litemall/storage || exit 2
 rm -f ./**
 
 # 重新部署服务
-cd /home/ubuntu/deploy/bin
+cd /home/ubuntu/deploy/bin || exit 2
 sudo ./deploy.sh
\ No newline at end of file
diff --git a/deploy/util/lazy.sh b/deploy/util/lazy.sh
index 0ca498af..fb7fadbd 100644
--- a/deploy/util/lazy.sh
+++ b/deploy/util/lazy.sh
@@ -15,26 +15,26 @@ ID_RSA=
 if test -z "$REMOTE"
 then
   echo "请设置云主机登录IP地址和账户"
-  exit -1
+  exit 1
 fi
 
 if test -z "$ID_RSA"
 then
   echo "请设置云主机登录IP地址和账户"
-  exit -1
+  exit 1
 fi
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-cd $DIR/../..
+cd $DIR/../.. || exit 2
 LITEMALL_HOME=$PWD
 echo "LITEMALL_HOME $LITEMALL_HOME"
 
 # 项目打包
-cd $LITEMALL_HOME
+cd $LITEMALL_HOME || exit 2
 ./deploy/util/package.sh
 
 # 上传云主机
-cd $LITEMALL_HOME
+cd $LITEMALL_HOME || exit 2
 scp -i $ID_RSA -r  ./deploy $REMOTE:/home/ubuntu/
 
 # 远程登录云主机并执行reset脚本