From b537461a9c58fd5222d209e810d32b56a3afb8bc Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sun, 18 Mar 2018 15:19:33 +0100 Subject: log_merge: Use shelcheck to harden the script Change-Id: I1b3a35b5f7ada2dbb0401a5d90a77a53979e1183 --- log_merge.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'log_merge.sh') diff --git a/log_merge.sh b/log_merge.sh index df52cfef..dee9cc2e 100755 --- a/log_merge.sh +++ b/log_merge.sh @@ -7,7 +7,7 @@ # # the output files will be called "Module-Testcase.merged" -if [ "x$1" == "x" ]; then +if [ "x$1" = "x" ]; then echo "You have to specify the Test Suite prefix" exit 2 fi @@ -15,16 +15,16 @@ fi BASE_NAME="$1" LOG_FILES="$BASE_NAME*.log" -TEST_CASES=`ls -1 $LOG_FILES | awk 'BEGIN { FS = "-" } { print $2 }' | sort | uniq` +TEST_CASES=$(ls -1 $LOG_FILES | awk 'BEGIN { FS = "-" } { print $2 }' | sort | uniq) for t in $TEST_CASES; do PREFIX="$BASE_NAME-$t" OUTPUT="$BASE_NAME.$t.merged" - ttcn3_logmerge $PREFIX-*.log > $OUTPUT + ttcn3_logmerge $PREFIX-*.log > "$OUTPUT" echo "Generated $OUTPUT" done -if [ "$2" == "--rm" ]; then +if [ "$2" = "--rm" ]; then echo "Removing Input log files !!!" - rm $LOG_FILES + rm "$LOG_FILES" fi -- cgit v1.2.3