Merge pull request #89 from Storj/makeStartScriptsConsistent

Making start scripts naming consistent
storj-archived · Oct 25, 2017 · 7d0c14b · 7d0c14b
2 parents 43831f2 + 74dc5df
commit 7d0c14b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -15,8 +15,9 @@
     "testsuite": "STORJ_ALLOW_LOOPBACK=1 NODE_ENV=test ./node_modules/.bin/_mocha --recursive test/**",
     "coverage": "STORJ_ALLOW_LOOPBACK=1 NODE_ENV=test ./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha -- --recursive",
     "linter": "./node_modules/.bin/eslint ./index.js ./lib ./test",
-    "dev": "NODE_ENV=development nodemon ./bin/storj-billing.js",
-    "start-prod": "NODE_ENV=production node ./bin/storj-billing.js",
+    "start": "if [[ ${NODE_ENV} == \"development\" ]]; then npm run start:dev; else npm run start:prod; fi",
+    "start:dev": "NODE_ENV=development nodemon ./bin/storj-billing.js",
+    "start:prod": "NODE_ENV=production node ./bin/storj-billing.js",
     "test": "npm run testsuite"
   },
   "repository": {

diff --git a/setup.sh b/setup.sh
@@ -3,10 +3,12 @@ cd /opt/app
 
 for dir in /usr/src/vendor/* ; do
   if [[ -d $dir ]]; then
-    echo "Manually linking $dir"
-    dir_name=$(basename $dir)
-    rm -rf /opt/app/node_modules/$dir_name
-    cp -rp $dir /opt/app/node_modules/$dir_name
+    if [ "$(ls -A $dir)" ]; then
+      echo "Manually linking $dir"
+      dir_name=$(basename $dir)
+      rm -rf /opt/app/node_modules/$dir_name
+      cp -rp $dir /opt/app/node_modules/$dir_name
+    fi
   fi
 
   echo "Rebuilding linked modules"