Merge pull request #1436 from robfrawley/bugfix-fix-bash-test-scripts

Fix test suite bash helper scripts on systems with multiple (and older) bash versions
liip · Dec 1, 2021 · 89e7563 · 89e7563
2 parents 6ed7f68 + 66e6bbf
commit 89e7563
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/tests/Fixtures/bin/post-process-as-file-error.bash b/tests/Fixtures/bin/post-process-as-file-error.bash
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 source "`cd $(dirname ${BASH_SOURCE[0]}) && pwd`/post-process-as-file.bash"
 

diff --git a/tests/Fixtures/bin/post-process-as-file.bash b/tests/Fixtures/bin/post-process-as-file.bash
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 source "`cd $(dirname ${BASH_SOURCE[0]}) && pwd`/post-process-common.bash"
 

diff --git a/tests/Fixtures/bin/post-process-as-stdin-error.bash b/tests/Fixtures/bin/post-process-as-stdin-error.bash
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 source "`cd $(dirname ${BASH_SOURCE[0]}) && pwd`/post-process-as-stdin.bash"
 

diff --git a/tests/Fixtures/bin/post-process-as-stdin.bash b/tests/Fixtures/bin/post-process-as-stdin.bash
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 source "`cd $(dirname ${BASH_SOURCE[0]}) && pwd`/post-process-common.bash"
 

diff --git a/tests/Fixtures/bin/post-process-common.bash b/tests/Fixtures/bin/post-process-common.bash
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 function writeScriptInformation()
 {
@@ -36,7 +36,7 @@ function writeScriptInformation()
 
 function writeScriptDebugFile()
 {
-  local debugFile="/tmp/post-process-fixture-bin.log"
+  local debugFile="${TMPDIR:-/tmp}/post-process-fixture-bin.log"
 
   if read -t 0; then
     cat | tee "${debugFile}"