From 67ece8a3c8732c574f8351972d0c35b280b73d3f Mon Sep 17 00:00:00 2001 From: gitpmside Date: Sun, 22 Feb 2015 19:08:25 +0100 Subject: [PATCH 1/2] only source utils.sh if exist test existing utils.sh before sourcing it --- check_glusterfs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/check_glusterfs b/check_glusterfs index 44420a5..ad9a04b 100644 --- a/check_glusterfs +++ b/check_glusterfs @@ -32,9 +32,12 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin PROGNAME=$(basename -- $0) PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'` -REVISION="1.0.1" +REVISION="1.0.3" -. $PROGPATH/utils.sh +if [ -f $PROGPATH/utils.sh ] +then + . $PROGPATH/utils.sh +fi # parse command line usage () { From 93bd46bf11ac58da37d33f64fdf311eca11d911a Mon Sep 17 00:00:00 2001 From: gitpmside Date: Wed, 27 May 2015 07:54:33 +0200 Subject: [PATCH 2/2] Fatal error if utils.sh is missing Fatal error if utils.sh is missing --- check_glusterfs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/check_glusterfs b/check_glusterfs index ad9a04b..204005c 100644 --- a/check_glusterfs +++ b/check_glusterfs @@ -37,6 +37,9 @@ REVISION="1.0.3" if [ -f $PROGPATH/utils.sh ] then . $PROGPATH/utils.sh +else + echo "Fatal error, missing $PROGPATH/utils.sh" + exit 1 fi # parse command line