From 17c732321154571cdaf0d157dd9f91a9ed48e98e Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 9 Mar 2010 14:51:49 -0800 Subject: [PATCH] Fix scripts to work when invoked from other directories. --- scripts/zpios-sanity.sh | 6 ++++-- scripts/zpios-survey.sh | 6 ++++-- scripts/zpios.sh | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/scripts/zpios-sanity.sh b/scripts/zpios-sanity.sh index d27a5b8ca6..7b38a883ec 100755 --- a/scripts/zpios-sanity.sh +++ b/scripts/zpios-sanity.sh @@ -2,9 +2,11 @@ # # ZFS/ZPOOL configuration test script. +basedir="$(dirname $0)" + SCRIPT_COMMON=common.sh -if [ -f ./${SCRIPT_COMMON} ]; then -. ./${SCRIPT_COMMON} +if [ -f "${basedir}/${SCRIPT_COMMON}" ]; then +. "${basedir}/${SCRIPT_COMMON}" elif [ -f /usr/libexec/zfs/${SCRIPT_COMMON} ]; then . /usr/libexec/zfs/${SCRIPT_COMMON} else diff --git a/scripts/zpios-survey.sh b/scripts/zpios-survey.sh index 0b16d1bb82..c82f7312bc 100755 --- a/scripts/zpios-survey.sh +++ b/scripts/zpios-survey.sh @@ -3,9 +3,11 @@ # Wrapper script for easily running a survey of zpios based tests # +basedir="$(dirname $0)" + SCRIPT_COMMON=common.sh -if [ -f ./${SCRIPT_COMMON} ]; then -. ./${SCRIPT_COMMON} +if [ -f "${basedir}/${SCRIPT_COMMON}" ]; then +. "${basedir}/${SCRIPT_COMMON}" elif [ -f /usr/libexec/zfs/${SCRIPT_COMMON} ]; then . /usr/libexec/zfs/${SCRIPT_COMMON} else diff --git a/scripts/zpios.sh b/scripts/zpios.sh index 6e9b3f50d5..e0b806cecf 100755 --- a/scripts/zpios.sh +++ b/scripts/zpios.sh @@ -3,9 +3,11 @@ # Wrapper script for easily running zpios based tests # +basedir="$(dirname $0)" + SCRIPT_COMMON=common.sh -if [ -f ./${SCRIPT_COMMON} ]; then -. ./${SCRIPT_COMMON} +if [ -f "${basedir}/${SCRIPT_COMMON}" ]; then +. "${basedir}/${SCRIPT_COMMON}" elif [ -f /usr/libexec/zfs/${SCRIPT_COMMON} ]; then . /usr/libexec/zfs/${SCRIPT_COMMON} else