separate setup step from postinstall

diff --git a/.travis.yml b/.travis.yml
index c500ef1..6ccacb2 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ before_install:
   - wget git.io/hikK5g | sudo bash
 
 before_script:
+  - npm run setup
   - npm start &
   - sleep 5
 

diff --git a/package.json b/package.json
index bcabfc6..4e6687b 100644 (file)
--- a/package.json
+++ b/package.json
@@ -76,10 +76,10 @@
     "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",
-    "start": "node_modules/.bin/nodemon node-datasource/main.js --debug --watch node-datasource",
+    "start": "node_modules/.bin/nodemon --debug --watch node-datasource",
     "test-build": "./node_modules/.bin/mocha -R spec test/build/build_app.js",
     "test": "./node_modules/.bin/mocha -R spec test/lib/login.js test/models/* test/database/* test/extensions/* test/lib/test_runner.js",
     "test-datasource": "./node_modules/.bin/mocha -R spec test/routes/*",
-    "postinstall": "node_modules/.bin/xtuple-server install --xt-demo --xt-quickstart"
+    "setup": "node_modules/.bin/xtuple-server install --xt-demo --xt-quickstart"
   }
 }