From 3fccd9615dcff9cae94fe91144d0dcef805b5514 Mon Sep 17 00:00:00 2001 From: Andreas Grimm Date: Mon, 11 Mar 2019 09:27:09 +0100 Subject: [PATCH] Review part 2. --- lib/main.sh | 6 +++--- lib/utils/loader.sh | 8 ++++---- metrics.sh | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/main.sh b/lib/main.sh index 3fabacb..d95e067 100644 --- a/lib/main.sh +++ b/lib/main.sh @@ -1,7 +1,7 @@ #!/bin/sh # load utils -for util in ${PWD}/lib/utils/*.sh; do +for util in ${DIR}/lib/utils/*.sh; do . $util done @@ -16,10 +16,10 @@ main_defaults () { DEFAULT_REPORTER=stdout fi if [ -z $CUSTOM_REPORTERS_PATH ]; then - CUSTOM_REPORTERS_PATH=${PWD}/reporters/custom + CUSTOM_REPORTERS_PATH=${DIR}/reporters/custom fi if [ -z $CUSTOM_METRICS_PATH ]; then - CUSTOM_METRICS_PATH=${PWD}/metrics/custom + CUSTOM_METRICS_PATH=${DIR}/metrics/custom fi } diff --git a/lib/utils/loader.sh b/lib/utils/loader.sh index 2c021c3..9fe62f7 100644 --- a/lib/utils/loader.sh +++ b/lib/utils/loader.sh @@ -2,7 +2,7 @@ get_available_reporters () { local result - for file in `ls ${PWD}/reporters/*.sh $CUSTOM_REPORTERS_PATH/*.sh 2> /dev/null`; do + for file in `ls ${DIR}/reporters/*.sh $CUSTOM_REPORTERS_PATH/*.sh 2> /dev/null`; do local filename=$(basename $file) local reporter=${filename%.*} result=$(echo "$result $reporter") @@ -12,7 +12,7 @@ get_available_reporters () { get_available_metrics () { local result - for file in `ls ${PWD}/metrics/*.sh $CUSTOM_METRICS_PATH/*.sh 2> /dev/null`; do + for file in `ls ${DIR}/metrics/*.sh $CUSTOM_METRICS_PATH/*.sh 2> /dev/null`; do local filename=$(basename $file) local metric=${filename%.*} # register metric @@ -26,7 +26,7 @@ load_reporter_with_prefix () { local name=$2 local file - for dir in $CUSTOM_REPORTERS_PATH ${PWD}/reporters; do + for dir in $CUSTOM_REPORTERS_PATH ${DIR}/reporters; do if [ -f $dir/$name.sh ]; then file=$dir/$name.sh break @@ -53,7 +53,7 @@ load_metric_with_prefix () { local name=$2 local file - for dir in $CUSTOM_METRICS_PATH ${PWD}/metrics; do + for dir in $CUSTOM_METRICS_PATH ${DIR}/metrics; do if [ -f $dir/$name.sh ]; then file=$dir/$name.sh break diff --git a/metrics.sh b/metrics.sh index ff8dc40..257ef34 100755 --- a/metrics.sh +++ b/metrics.sh @@ -4,7 +4,7 @@ LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 LANGUAGE=en_US.UTF-8 -PWD=$(dirname "$0") +DIR=$(dirname "$0") usage () { echo " Usage: $0 [-d] [-h] [-v] [-c] [-m] [-r] [-i] [-C] [-u]" @@ -91,7 +91,7 @@ while [ $# -gt 0 ]; do done # run -. ${PWD}/lib/main.sh +. ${DIR}/lib/main.sh if [ $opt_do_update = true ]; then if ! command_exists git; then