Cleanup run-solid-test-suite.sh

- Change hard-coded shebang with portable one
- Replace deprecated backticks with subshell
- Quote variables
- Encapsulate logic to be re-usable (i.e. so the script can be sourced)

Author: Potherca

run-solid-test-suite.sh

@@ -1,4 +1,5 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
 set -e
 
 function setup {
@@ -13,9 +14,10 @@ function setup {
   docker pull solidtestsuite/web-access-control-tests:v7.1.0
   docker tag solidtestsuite/web-access-control-tests:v7.1.0 web-access-control-tests
 }
+
 function teardown {
-  docker stop `docker ps --filter network=testnet -q`
-  docker rm `docker ps --filter network=testnet -qa`
+  docker stop "$(docker ps --filter network=testnet -q)"
+  docker rm "$(docker ps --filter network=testnet -qa)"
   docker network remove testnet
 }
 
@@ -24,21 +26,21 @@ function startPubSub {
 }
 
 function startSolidNextcloud {
-  docker run -d --name $1 --network=testnet --env-file ./env-vars-$1.list solid-nextcloud
-  until docker run --rm --network=testnet solidtestsuite/webid-provider-tests curl -kI https://$1 2> /dev/null > /dev/null
+  docker run -d --name "$1" --network=testnet --env-file "./env-vars-$1.list solid-nextcloud"
+  until docker run --rm --network=testnet solidtestsuite/webid-provider-tests curl -kI "https://$1" 2> /dev/null > /dev/null
   do
-    echo Waiting for $1 to start, this can take up to a minute ...
+    echo Waiting for "$1" to start, this can take up to a minute ...
     docker ps -a
-    docker logs $1
+    docker logs "$1"
     sleep 1
   done
 
-  docker logs $1
-  echo Running init script for Nextcloud $1 ...
-  docker exec -u www-data -it -e SERVER_ROOT=https://$1 $1 sh /init.sh
-  docker exec -u root -it $1 service apache2 reload
-  echo Getting cookie for $1...
-  export COOKIE_$1="`docker run --cap-add=SYS_ADMIN --network=testnet --env-file ./env-vars-$1.list michielbdejong/nextcloud-cookie`"
+  docker logs "$1"
+  echo "Running init script for Nextcloud $1 ..."
+  docker exec -u www-data -it -e SERVER_ROOT="https://$1" "$1" sh /init.sh
+  docker exec -u root -it "$1" service apache2 reload
+  echo Getting cookie for "$1"...
+  export COOKIE_$1="$(docker run --cap-add=SYS_ADMIN --network=testnet --env-file "./env-vars-$1.list" michielbdejong/nextcloud-cookie)"
 }
 
 function runTests {
@@ -51,13 +53,26 @@ function runTests {
     --env-file ./env-vars-testers.list $1-tests
 }
 
-# ...
-teardown || true
-setup
-startPubSub
-startSolidNextcloud server
-startSolidNextcloud thirdparty
-runTests webid-provider
-runTests web-access-control
-runTests solid-crud
-teardown
+run_solid_test_suite() {
+    # ...
+    teardown || true
+    setup
+    startPubSub
+    startSolidNextcloud server
+    startSolidNextcloud thirdparty
+    runTests webid-provider
+    runTests web-access-control
+    runTests solid-crud
+    teardown
+}
+
+if [ "${BASH_SOURCE[0]}" == "${0}" ]; then
+  run_solid_test_suite "${@}"
+else
+    export -f run_solid_test_suite
+    export -f runTests
+    export -f setup
+    export -f startPubSub
+    export -f startSolidNextcloud
+    export -f teardown
+fi