tweaks; remove npmignore since it was hiding the inclusion of login_data

diff --git a/.npmignore b/.npmignore
deleted file mode 100644 (file)
index dfea689..0000000
--- a/.npmignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.git
-npm-debug.log
-.sw*

diff --git a/.travis.yml b/.travis.yml
index cca00c1..d5fdbfe 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,4 +22,6 @@ after_failure:
   - env
   - cat test/lib/login_data.json
   - cat node-datasource/config.js
-  - sudo cat npm-debug.log
+  - ls -l enyo-client/application
+  - ls -l lib
+  - cat npm-debug.log

diff --git a/enyo-client/application/tools/deploy.sh b/enyo-client/application/tools/deploy.sh
index f2f4984..0756b9e 100755 (executable)
--- a/enyo-client/application/tools/deploy.sh
+++ b/enyo-client/application/tools/deploy.sh
@@ -9,7 +9,7 @@ FOLDER=deploy
 SUFFIX=`date "+-%Y_%m_%d-%I_%M_%S%p"`
 
 # The grandparent folder for this script
-SOURCE=$(cd `dirname $0`/../; pwd)
+SOURCE=$(cd `dirname $0`/..; pwd)
 
 # extract project folder name
 NAME=${SOURCE##*/}

diff --git a/package.json b/package.json
index d3fcdec..872aed5 100644 (file)
--- a/package.json
+++ b/package.json
@@ -91,11 +91,11 @@
     "build-basic-quickstart": "./scripts/build_app.js -d quickstart --databaseonly -e foundation-database -i -s foundation-database/quickstart_data.sql",
     "jshint": "./node_modules/.bin/jshint --exclude node-datasource/lib/query/node_modules lib/backbone-x/source lib/enyo-x/source lib/tools/source enyo-client/application/source/ enyo-client/extensions node-datasource",
     "preinstall": "cd node-datasource/lib/query ; npm install",
-    "postinstall": "rm enyo-client/application/lib lib/module ; ln -s ../../lib enyo-client/application/lib && ln -s ../node_modules lib/module",
+    "postinstall": "rm enyo-client/application/lib lib/module ; ln -s ../../lib enyo-client/application/lib ; ln -s ../node_modules lib/module",
     "start": "node_modules/.bin/nodemon --debug --watch node-datasource",
     "test": "./node_modules/.bin/mocha -R spec test/lib/login.js test/models/* test/database/* test/extensions/* test/lib/test_runner.js",
     "test-build": "./node_modules/.bin/mocha -R spec test/build/build_app.js",
     "test-datasource": "./node_modules/.bin/mocha -R spec test/routes/*",
-    "server-setup": "./node_modules/.bin/xtuple-server install-pilot --xt-demo"
+    "server-setup": "./node_modules/.bin/xtuple-server install-pilot --xt-demo --pg-worldlogin"
   }
 }