From cb29b2f9843644a31be097f6ff47f9eb93aa0667 Mon Sep 17 00:00:00 2001 From: Izaak Beekman Date: Fri, 10 Feb 2017 19:00:00 -0500 Subject: [PATCH] Restore @mstreuhofer's changes that I clobbered --- main.sh | 1 - test/fixture/main-debug.stdio | 1 - test/fixture/main-nocolor.stdio | 1 - 3 files changed, 3 deletions(-) diff --git a/main.sh b/main.sh index 5e675d3..6aa8bcb 100755 --- a/main.sh +++ b/main.sh @@ -374,7 +374,6 @@ info "__file: ${__file}" info "__dir: ${__dir}" info "__base: ${__base}" info "OSTYPE: ${OSTYPE}" -info "Script called directly? $([[ "${__i_am_main_script}" = "1" ]] && echo "yes" || echo "no")" info "arg_f: ${arg_f}" info "arg_d: ${arg_d}" diff --git a/test/fixture/main-debug.stdio b/test/fixture/main-debug.stdio index 7f40ee2..ec65b64 100644 --- a/test/fixture/main-debug.stdio +++ b/test/fixture/main-debug.stdio @@ -5,7 +5,6 @@ ACCPTST:STDIO_REPLACE_DATETIMES {datetime} UTC [ info] __dir: {root} {datetime} UTC [ info] __base: main {datetime} UTC [ info] OSTYPE: {OSTYPE} -{datetime} UTC [ info] Script called directly? yes {datetime} UTC [ info] arg_f: {tmpdir}/x {datetime} UTC [ info] arg_d: 0 {datetime} UTC [ info] arg_v: 0 diff --git a/test/fixture/main-nocolor.stdio b/test/fixture/main-nocolor.stdio index bbc459c..2cb3a6b 100644 --- a/test/fixture/main-nocolor.stdio +++ b/test/fixture/main-nocolor.stdio @@ -5,7 +5,6 @@ ACCPTST:STDIO_REPLACE_DATETIMES {datetime} UTC [ info] __dir: {root} {datetime} UTC [ info] __base: main {datetime} UTC [ info] OSTYPE: {OSTYPE} -{datetime} UTC [ info] Script called directly? yes {datetime} UTC [ info] arg_f: {tmpdir}/x {datetime} UTC [ info] arg_d: 0 {datetime} UTC [ info] arg_v: 0