From 3f1e2c7c13b459a9a9e69894da5ca6ad39f9ed5a Mon Sep 17 00:00:00 2001 From: Scott McCarty Date: Wed, 8 Jul 2015 16:46:02 -0400 Subject: [PATCH] Made some minor changes after check with ShellCheck. Also fixed sourcing and verified that things work right with bash -x. Signed-off-by: Scott McCarty --- tests/1_1_check.sh | 9 ++++----- tests/1_host_configuration.sh | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/1_1_check.sh b/tests/1_1_check.sh index 4bde2e1..4a3f972 100755 --- a/tests/1_1_check.sh +++ b/tests/1_1_check.sh @@ -1,7 +1,6 @@ -# Run tests -THINPOOLDEV=`ps -ef | grep docker | awk '/--storage-opt/ { for (x=1;x<=NF;x++) if ($x~"--storage-opt") print $(x+1) }' | grep thinpooldev | awk -F\= '{print $2}'` -ROOTVOLUME=`df -P | grep " \/$" | awk '{print $1}'` -SEPARATEPARTITION=`grep /var/lib/docker /etc/fstab` +THINPOOLDEV=$(ps -ef | grep docker | awk '/--storage-opt/ { for (x=1;x<=NF;x++) if ($x~"--storage-opt") print $(x+1) }' | grep thinpooldev | awk -F= '{print $2}') +ROOTVOLUME=$(df -P | grep " \/$" | awk '{print $1}') +SEPARATEPARTITION=$(grep /var/lib/docker /etc/fstab) # Verify that somebody didn't put a dummy entry in /etc/fstab and are really # using devicemapper @@ -16,4 +15,4 @@ else RETVAL=1 fi -return $RETVAL +return $RETVAL diff --git a/tests/1_host_configuration.sh b/tests/1_host_configuration.sh index 6d35ce3..d4bdd3c 100644 --- a/tests/1_host_configuration.sh +++ b/tests/1_host_configuration.sh @@ -5,7 +5,7 @@ info "1 - Host Configuration" # 1.1 check_1_1="1.1 - Create a separate partition for containers" -sh 1_1_check.sh 2>&1 +source tests/1_1_check.sh 2>&1 if [ $? -eq 0 ]; then pass "$check_1_1" else