Fix some Bash issues (#491)

88d6c939 · Robin Richtsfeld · Kenneth Reitz · b261158b · 88d6c939 · 88d6c939
Commit 88d6c939 authored 7 years ago by Robin Richtsfeld Committed by Kenneth Reitz 7 years ago
--- a/test/shunit2
+++ b/test/shunit2
@@ -25,9 +25,9 @@ SHUNIT_ERROR=2
 # enable strict mode by default
 SHUNIT_STRICT=${SHUNIT_STRICT:-${SHUNIT_TRUE}}
-_shunit_warn() { echo "shunit2:WARN $@" >&2; }
+_shunit_warn() { echo "shunit2:WARN $*" >&2; }
-_shunit_error() { echo "shunit2:ERROR $@" >&2; }
+_shunit_error() { echo "shunit2:ERROR $*" >&2; }
-_shunit_fatal() { echo "shunit2:FATAL $@" >&2; exit ${SHUNIT_ERROR}; }
+_shunit_fatal() { echo "shunit2:FATAL $*" >&2; exit ${SHUNIT_ERROR}; }
 # specific shell checks
 if [ -n "${ZSH_VERSION:-}" ]; then

--- a/test/utils
+++ b/test/utils
@@ -36,7 +36,7 @@ capture()
  LAST_COMMAND="$@"
-  $@ >${STD_OUT} 2>${STD_ERR}
+  "$@" >${STD_OUT} 2>${STD_ERR}
  RETURN=$?
  rtrn=${RETURN} # deprecated
 }

--- a/vendor/shunit2
+++ b/vendor/shunit2
@@ -25,9 +25,9 @@ SHUNIT_ERROR=2
 # enable strict mode by default
 SHUNIT_STRICT=${SHUNIT_STRICT:-${SHUNIT_TRUE}}
-_shunit_warn() { echo "shunit2:WARN $@" >&2; }
+_shunit_warn() { echo "shunit2:WARN $*" >&2; }
-_shunit_error() { echo "shunit2:ERROR $@" >&2; }
+_shunit_error() { echo "shunit2:ERROR $*" >&2; }
-_shunit_fatal() { echo "shunit2:FATAL $@" >&2; exit ${SHUNIT_ERROR}; }
+_shunit_fatal() { echo "shunit2:FATAL $*" >&2; exit ${SHUNIT_ERROR}; }
 # specific shell checks
 if [ -n "${ZSH_VERSION:-}" ]; then

--- a/vendor/test-utils
+++ b/vendor/test-utils
@@ -36,7 +36,7 @@ capture()
  LAST_COMMAND="$@"
-  $@ >${STD_OUT} 2>${STD_ERR}
+  "$@" >${STD_OUT} 2>${STD_ERR}
  RETURN=$?
  rtrn=${RETURN} # deprecated
 }