Fix ShellCheck issues in cleanup scripts

Change-Id: I58f020ba7d34d2cfeffaba5a3a30c3c2087e57b2
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/integration/include-raw-integration-cleanup-tmp.sh b/jjb/integration/include-raw-integration-cleanup-tmp.sh
index f1e8255f95ea607a1c2c7754e363f8b4d2ecd4c4..f7c12b2fa7236f63b17cc42ebc013751ef863d02 100644 (file)
--- a/jjb/integration/include-raw-integration-cleanup-tmp.sh
+++ b/jjb/integration/include-raw-integration-cleanup-tmp.sh
@@ -1,6 +1,7 @@
+#!/bin/bash
 echo "Cleaning up Robot installation..."
 
 # ${ROBOT_VENV} comes from the include-raw-integration-install-robotframework.sh
 # script.
 # TODO: Is this still needed when we have integration-cleanup-workspace?
-rm -rf ${ROBOT_VENV}
+rm -rf "${ROBOT_VENV}"

diff --git a/jjb/integration/include-raw-integration-cleanup-workspace.sh b/jjb/integration/include-raw-integration-cleanup-workspace.sh
index 32c90305bd6169a240363f1f4e0d98f4afa34209..f824262aeb025c56f7692f171b486425bfe25d74 100644 (file)
--- a/jjb/integration/include-raw-integration-cleanup-workspace.sh
+++ b/jjb/integration/include-raw-integration-cleanup-workspace.sh
@@ -1,9 +1,12 @@
+#!/bin/bash
 echo "Cleaning up the workspace..."
 
 # Leftover files from previous runs could be wrongly copied as results.
 # Keep the cloned integration/test repository!
-for file_or_dir in `ls -A -1 -I "test"`
+for file_or_dir in *
 # FIXME: Make this compatible with multipatch and other possible build&run jobs.
 do
-  rm -vrf "$file_or_dir"
+    if [ "$file_or_dir" != "test" ]; then
+        rm -vrf "$file_or_dir"
+    fi
 done