fix: fix linux-specific shellscript errors and integ test (#229)

* Quick fix to OpenFaaS's bootstrap.sh script * fix: fix linux-specific shellscript errors and integ test
garden-io · Aug 13, 2018 · 1dc936e · 1dc936e
1 parent 877a74c
commit 1dc936e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/examples/hello-world/services/hello-container/test/integ.js b/examples/hello-world/services/hello-container/test/integ.js
@@ -7,7 +7,7 @@ describe('GET /hello', () => {
   it('respond with message from hello-function', (done) => {
     agent
       .get("/hello")
-      .expect(200, { message: "Hello there, I'm a function" })
+      .expect(200, { message: "Hello there, I'm an OpenFaaS function" })
       .end((err) => {
         if (err) return done(err)
         done()

diff --git a/garden-cli/static/openfaas/openfaas-builder/bootstrap.sh b/garden-cli/static/openfaas/openfaas-builder/bootstrap.sh
@@ -1,6 +1,6 @@
-#!/usr/bin/env bash -eo pipefail
+#!/bin/bash
+set -e
 
-here=$(cd `dirname $0` && pwd)
 cli_filename="faas-cli"
 
 if [ "${PLATFORM}" = "darwin" ]; then
@@ -11,7 +11,7 @@ fi
 
 # use npx for cross-platform compatibility
 npx node-wget -- https://github.com/openfaas/faas-cli/releases/download/0.6.15/${cli_filename}
-mv ${cli_filename} faas-cli
+mv ${cli_filename} faas-cli || true 
 chmod +x faas-cli
 
 ./faas-cli template pull
diff --git a/garden-cli/test/integ/run b/garden-cli/test/integ/run
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -eo pipefail
+#!/bin/bash
+set -e
 
 here=$(cd `dirname $0` && pwd)
 garden_root=$(cd ${here} && cd $(git rev-parse --show-toplevel) && pwd)