From b0b9cd6fcfb47074ba1cf8f73ca863b21573bbdf Mon Sep 17 00:00:00 2001
From: Philippe Coval
Date: Fri, 10 Aug 2018 17:42:38 +0200
Subject: [PATCH] build: Support gateway-docker, quit on error
To avoid unexpected behaviours, quit on error (set -e)
Change-Id: Ifbf6401b66afd71472f1b953a7aa4b57c0ecfd3f
Relate-to: https://github.com/mozilla-iot/gateway-docker/pull/9
Signed-off-by: Philippe Coval
---
run-app.sh | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/run-app.sh b/run-app.sh
index afa219114..890f8f36f 100755
--- a/run-app.sh
+++ b/run-app.sh
@@ -1,7 +1,9 @@
#!/bin/bash
+set -e
set -x
MOZIOT_HOME="${MOZIOT_HOME:=${HOME}/.mozilla-iot}"
+args=""
is_docker_container() {
if [ -f /.dockerenv ]; then
@@ -14,8 +16,8 @@ is_docker_container() {
return 1
}
-
if ! is_docker_container; then
+ args="$args --check-wifi"
if [ ! -f .post_upgrade_complete ]; then
./tools/post-upgrade.sh
fi
@@ -23,18 +25,18 @@ fi
run_app() {
export NVM_DIR="$HOME/.nvm"
- [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
+ [ ! -s "$NVM_DIR/nvm.sh" ] || \. "$NVM_DIR/nvm.sh" # This loads nvm
sudo /sbin/ldconfig
echo "nvm version"
- nvm --version
+ nvm --version || echo "Use system's node insead of nvm"
echo "node version"
node --version
echo "npm version"
npm --version
echo "Starting gateway ..."
- npm start -- --check-wifi
+ npm start -- $args
}
mkdir -p "${MOZIOT_HOME}/log"