diff --git a/tap/jdg-tap-tool-dispatcher b/tap/jdg-tap-tool-dispatcher
index d2ff621..bf35ced 100755
--- a/tap/jdg-tap-tool-dispatcher
+++ b/tap/jdg-tap-tool-dispatcher
@@ -8,8 +8,7 @@ BASE_BIN=${BASE_BIN:-/usr/bin}
 CMDLINE_OPTS=disable-checkbashism,disable-pep8,disable-perlcritic,disable-shellcheck,disable-mergecheck
 CMDLINE_OPTS+=,file-list,help
 
-_opt_temp=$(getopt --name jdg-tap-tool-dispatcher -o -f+h --long $CMDLINE_OPTS -- "$@")
-if [ $? -ne 0 ]; then
+if ! _opt_temp=$(getopt --name jdg-tap-tool-dispatcher -o -f+h --long $CMDLINE_OPTS -- "$@") ; then
   echo "Try '$0 --help' for more information." >& 2
   exit 1
 fi
@@ -145,19 +144,22 @@ if ! [ -x "$(which shellcheck)" ] ; then
   echo "*** Skipping shellcheck checks as tool shellcheck isn't present ***"
 else
   if $_opt_shellcheck ; then
-    echo "${BASE_BIN}/jdg-tap-shellcheck '{}' '>' ${REPORTS_DIRECTORY}'/{}_shellcheck.tap' ';'" >> "${TMPFILE}"
+    echo "${BASE_BIN}/jdg-tap-shellcheck '{}' '>' ${REPORTS_DIRECTORY}'/{}_shellcheck.tap' ';' \\" >> "${TMPFILE}"
   else
     echo "*** Skipping shellcheck tests as requested via --disable-shellcheck ***"
   fi
 fi
 
 if $_opt_mergecheck ; then
-  echo "${BASE_BIN}/jdg-tap-merge-conflict '{}' '>' ${REPORTS_DIRECTORY}'/{}_mergecheck.tap' ';'" >> "${TMPFILE}"
+  echo "${BASE_BIN}/jdg-tap-merge-conflict '{}' '>' ${REPORTS_DIRECTORY}'/{}_mergecheck.tap' ';' \\" >> "${TMPFILE}"
 else
   echo "*** Skipping merge-conflict check tests as requested via --disable-mergecheck ***"
 fi
 
-# generate the executed script
+# generate noop to properly mark end of script
+echo "# EOF" >> "${TMPFILE}"
+
+# execute the generated script
 bash "${TMPFILE}"
 rm -f "${TMPFILE}"