Skip to content

Commit

Permalink
build: Support gateway-docker, quit on error
Browse files Browse the repository at this point in the history
To avoid unexpected behaviours, quit on error (set -e)

Change-Id: Ifbf6401b66afd71472f1b953a7aa4b57c0ecfd3f
Relate-to: WebThingsIO/gateway-docker#9
Signed-off-by: Philippe Coval <p.coval@samsung.com>
  • Loading branch information
rzr committed Aug 10, 2018
1 parent a79a097 commit b0b9cd6
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions run-app.sh
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -14,27 +16,27 @@ 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
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"
Expand Down

0 comments on commit b0b9cd6

Please sign in to comment.