Release 1.1.162

Author: predix-adoption-bot

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "predix-nodejs-starter",
-  "version": "1.1.157",
+  "version": "1.1.162",
   "private": true,
   "scripts": {
     "start": "node server/app.js",
@@ -18,7 +18,7 @@
     "https-proxy-agent": "^1.0.0",
     "passport": ">= 0.0.0",
     "passport-oauth2-middleware": "*",
-    "passport-predix-oauth": "0.1.49",
+    "passport-predix-oauth": "0.1.55",
     "request": "~2.67.0",
     "url": "~0.11.0"
   },

package.json

@@ -35,25 +35,31 @@ function local_read_args() {
   fi
 }
 
+# default settings
 BRANCH="master"
 PRINT_USAGE=0
 SKIP_SETUP=false
+
+IZON_SH="https://raw.githubusercontent.com/PredixDev/izon/1.1.0/izon2.sh"
 #ASSET_MODEL="-amrmd predix-ui-seed/server/sample-data/predix-asset/asset-model-metadata.json predix-ui-seed/server/sample-data/predix-asset/asset-model.json"
 SCRIPT="-script build-basic-app.sh -script-readargs build-basic-app-readargs.sh"
 QUICKSTART_ARGS="-ba -uaa -asset -ts -wd -nsts $SCRIPT"
 VERSION_JSON="version.json"
 PREDIX_SCRIPTS=predix-scripts
 REPO_NAME=predix-nodejs-starter
-SCRIPT_NAME="quickstart-front-end-webapp.sh"
+SCRIPT_NAME="quickstart-front-end-basic-node-express.sh"
+GITHUB_RAW="https://raw.githubusercontent.com/PredixDev"
 APP_DIR="build-basic-app"
 APP_NAME="Predix Front End Basic App - Node.js Express with UAA, Asset, Time Series"
 TOOLS="Cloud Foundry CLI, Git, Node.js, Maven, Predix CLI"
 TOOLS_SWITCHES="--cf --git --nodejs --maven --predixcli"
 
+# Process switches
 local_read_args $@
-IZON_SH="https://raw.githubusercontent.com/PredixDev/izon/$BRANCH/izon.sh"
-VERSION_JSON_URL=https://raw.githubusercontent.com/PredixDev/predix-nodejs-starter/$BRANCH/version.json
 
+#variables after processing switches
+SCRIPT_LOC="$GITHUB_RAW/$REPO_NAME/$BRANCH/$SCRIPT_NAME"
+VERSION_JSON_URL="$GITHUB_RAW/$REPO_NAME/$BRANCH/version.json"
 
 function check_internet() {
   set +e
@@ -86,9 +92,10 @@ function init() {
 
   #get the script that reads version.json
   eval "$(curl -s -L $IZON_SH)"
-
+  getUsingCurl $SCRIPT_LOC
+  chmod 755 $SCRIPT_NAME
   getVersionFile
-  getLocalSetupFuncs
+  getLocalSetupFuncs $GITHUB_RAW
 }
 
 if [[ $PRINT_USAGE == 1 ]]; then

scripts/quickstart-front-end-basic-node-express.sh

@@ -35,6 +35,7 @@ function local_read_args() {
   fi
 }
 
+IZON_SH="https://raw.githubusercontent.com/PredixDev/izon/1.1.0/izon2.sh"
 BRANCH="master"
 PRINT_USAGE=0
 SKIP_SETUP=false
@@ -47,19 +48,24 @@ REPO_NAME=predix-nodejs-starter
 SCRIPT_NAME="quickstart-front-end-template.sh"
 APP_DIR="frontend-microservice-template"
 APP_NAME="Predix Front End WebApp Microservice Template"
+GITHUB_RAW="https://raw.githubusercontent.com/PredixDev"
 TOOLS="Cloud Foundry CLI, Git, Node.js, Predix CLI"
 TOOLS_SWITCHES="--cf --git --nodejs --predixcli"
 
+# Process switches
 local_read_args $@
-IZON_SH="https://raw.githubusercontent.com/PredixDev/izon/$BRANCH/izon.sh"
-VERSION_JSON_URL=https://raw.githubusercontent.com/PredixDev/predix-nodejs-starter/$BRANCH/version.json
 
+#variables after processing switches
+echo "branch=$BRANCH"
+SCRIPT_LOC="$GITHUB_RAW/$REPO_NAME/$BRANCH/scripts/$SCRIPT_NAME"
+VERSION_JSON_URL="$GITHUB_RAW/$REPO_NAME/$BRANCH/version.json"
+echo "VERSION_JSON_URL=$VERSION_JSON_URL"
 
 function check_internet() {
   set +e
   echo ""
   echo "Checking internet connection..."
-  curl "http://google.com" > /dev/null 2>&1
+  curl "http://github.com" > /dev/null 2>&1
   if [ $? -ne 0 ]; then
     echo "Unable to connect to internet, make sure you are connected to a network and check your proxy settings if behind a corporate proxy"
     echo "If you are behind a corporate proxy, set the 'http_proxy' and 'https_proxy' environment variables."
@@ -85,9 +91,10 @@ function init() {
 
   #get the script that reads version.json
   eval "$(curl -s -L $IZON_SH)"
-
+  getUsingCurl $SCRIPT_LOC
+  chmod 755 $SCRIPT_NAME
   getVersionFile
-  getLocalSetupFuncs
+  getLocalSetupFuncs $GITHUB_RAW
 }
 
 if [[ $PRINT_USAGE == 1 ]]; then

scripts/quickstart-front-end-template.sh

@@ -1,13 +1,13 @@
 {
   "name": "Predix Front End Web App.html",
-  "version": "1.1.157",
+  "version": "1.1.162",
   "private": true,
   "dependencies": {
-    "local-setup": "https://github.com/PredixDev/local-setup#1.0.88",
-    "predix-scripts": "https://github.com/PredixDev/predix-scripts#1.1.133",
-    "Predix-HelloWorld-WebApp": "https://github.com/PredixDev/Predix-HelloWorld-WebApp#1.1.136",
-    "predix-nodejs-starter": "https://github.com/PredixDev/predix-nodejs-starter#",
-    "winddata-timeseries-service": "https://github.com/PredixDev/winddata-timeseries-service#2.0.54"
+    "local-setup": "https://github.com/PredixDev/local-setup#1.0.101",
+    "predix-scripts": "https://github.com/PredixDev/predix-scripts#1.1.158",
+    "Predix-HelloWorld-WebApp": "https://github.com/PredixDev/Predix-HelloWorld-WebApp#1.1.143",
+    "predix-nodejs-starter": "https://github.com/PredixDev/predix-nodejs-starter#1.1.162",
+    "winddata-timeseries-service": "https://github.com/PredixDev/winddata-timeseries-service#2.0.59"
   },
   "author": "turnerth"
 }