Merge branch 'upgrade/node10' into server-npm-integration

Conflicts:
	package.json
	scripts/install_xtuple.sh

diff --cc package.json
index bfa2e74,9b9c65c..fc97f72
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -46,27 -46,20 +46,30 @@@
    },
    "devDependencies": {
      "chai": "1.5.x",
 +    "csslint": "~0.10.0",
 +    "html5": "0.3.13",
      "jshint": "2.4.x",
      "mocha": "1.9.x",
 +    "nde": "^0.1.15",
 +    "nodemon": "~1.0.15",
 +    "nopt": "2.0.0",
      "require-uncache": "0.0.x",
-     "zombie": "1.4.x"
 +    "shelljs": "0.0.8",
+     "html5": "0.3.13",
+     "zombie": "2.x",
+     "csslint": "~0.10.0",
+     "nodemon": "~1.0.15"
    },
 +  "bundledDependencies": [
 +    "nopt",
 +    "shelljs"
 +  ],
    "optionalDependencies": {
      "xtuple-query": "~1.0.0",
      "googleapis": "~0.4.6"
    },
    "engines": {
--    "node": "0.8.x"
++    "node": ">= 0.10.28"
    },
    "main": "node-datasource/main.js",
    "scripts": {
@@@ -76,10 -69,9 +79,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-build": "./node_modules/.bin/mocha -R spec test/build/build_app.js",
 -    "test": "NODE_TLS_REJECT_UNAUTHORIZED=0 ./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/*"
 +    "test-datasource": "./node_modules/.bin/mocha -R spec test/routes/*",
 +    "setup": "./node_modules/.bin/xtuple-server install --xt-demo --xt-quickstart"
    }
  }

diff --cc scripts/install_xtuple.sh
index d168eee,75f93a8..c19ded0
--- 1/scripts/install_xtuple.sh
--- 2/scripts/install_xtuple.sh
+++ b/scripts/install_xtuple.sh
@@@ -1,36 -1,12 +1,36 @@@
  #!/bin/bash
  
 +set -e
 +
 +echo -n "Checking for sudo..."
 +if ! which sudo ;
 +then
 +  echo "Please install sudo and grant yourself access to sudo:"
 +  echo
 +  echo "   # apt-get install sudo"
 +  echo "   # addgroup $USER sudo"
 +  echo
 +  exit 1
 +fi
 +
  alias sudo='sudo env PATH=$PATH $@'
  
- NODE_VERSION=0.8.26
 +# Make sure we have all the essential tools we need
 +sudo apt-get update
 +sudo apt-get -q -y install \
 +  git \
 +  curl \
 +  python-software-properties \
 +  software-properties-common
 +
+ NODE_VERSION=0.10.26
  
 +DEBDIST=`lsb_release -c -s`
 +echo "Trying to install xTuple for platform ${DEBDIST}"
 +
  RUN_DIR=$(pwd)
  LOG_FILE=$RUN_DIR/install.log
 -cp $LOG_FILE $LOG_FILE.old 2>&1 &> /dev/null
 +cp $LOG_FILE $LOG_FILE.old 2>&1 &> /dev/null || true
  log() {
        echo "xtuple >> $@"
        echo $@ >> $LOG_FILE