more robust git, pm2 management (#55)

3box · Jan 18, 2019 · 4b1a5f7 · 4b1a5f7
1 parent c4fef07
commit 4b1a5f7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,6 +35,8 @@ jspm_packages/
 
 # dotenv environment variables file
 .env
+.env.development
+.env.production
 
 # parcel-bundler cache (https://parceljs.org/)
 .cache

diff --git a/deploy.sh b/deploy.sh
@@ -4,7 +4,11 @@ if [[ "$CIRCLE_BRANCH" == "develop" ]]; then
   git stash
   git checkout -f develop
   git pull origin develop
-  npm i -g pm2
+  git reset --hard origin/develop
+  if [ (npm list -g | grep pm2 | wc -l) -eq 0]; then
+    npm i -g pm2
+    pm2 update
+  fi
   npm i
   if [ ! -f .env.development ]; then
     cp .env.development.example .env.development
@@ -15,7 +19,11 @@ if [ "$CIRCLE_BRANCH" == "master" ]; then
   git stash
   git checkout -f master
   git pull origin master
-  npm i -g pm2
+  git reset --hard origin/master
+  if [ (npm list -g | grep pm2 | wc -l) -eq 0]; then
+    npm i -g pm2
+    pm2 update
+  fi
   npm i
   if [ ! -f .env.production ]; then
     cp .env.production.example .env.production