diff --git a/ttcn3-dumpcap-stop.sh b/ttcn3-dumpcap-stop.sh index e13fbc0f4..188b8da4e 100755 --- a/ttcn3-dumpcap-stop.sh +++ b/ttcn3-dumpcap-stop.sh @@ -22,11 +22,10 @@ fi date if [ x"$VERDICT" = x"pass" ]; then - echo -e "\033[1;32m====== $TESTCASE $VERDICT ======\033[0m" + printf "\033[1;32m====== $TESTCASE $VERDICT ======\033[0m\n\n" else - echo -e "\033[1;31m------ $TESTCASE $VERDICT ------\033[0m" + printf "\033[1;31m------ $TESTCASE $VERDICT ------\033[0m\n\n" fi -echo if [ "z$TTCN3_PCAP_PATH" = "z" ]; then TTCN3_PCAP_PATH=/tmp diff --git a/ttcn3-tcpdump-stop.sh b/ttcn3-tcpdump-stop.sh index 0feaeaa9c..82d3a4fbb 100755 --- a/ttcn3-tcpdump-stop.sh +++ b/ttcn3-tcpdump-stop.sh @@ -26,21 +26,11 @@ kill_rm_pidfile() { date -# -e only works/is required only in Bash; in dash/POSIX shells it isn't required and will be part of the output -# SHELL environment variable doesn't always give name of current shell (e.g. for dash run inside bash...) -SHELL_NAME="$(cat /proc/$$/cmdline | tr -d '\0')" -if [ "$SHELL_NAME" = "bash" ]; then - ESCAPE_OPT="-e" -else - ESCAPE_OPT="" -fi - if [ x"$VERDICT" = x"pass" ]; then - echo $ESCAPE_OPT "\033[1;32m====== $TESTCASE $VERDICT ======\033[0m" + printf "\033[1;32m====== $TESTCASE $VERDICT ======\033[0m\n\n" else - echo $ESCAPE_OPT "\033[1;31m------ $TESTCASE $VERDICT ------\033[0m" + printf "\033[1;31m------ $TESTCASE $VERDICT ------\033[0m\n\n" fi -echo if [ "z$TTCN3_PCAP_PATH" = "z" ]; then TTCN3_PCAP_PATH=/tmp