From cee56109cd04b1a6dbb4c7a4de47dc378eb8aeb9 Mon Sep 17 00:00:00 2001 From: Hans-Christian Stadler Kleeb Date: Mon, 13 Apr 2015 15:51:51 +0200 Subject: [PATCH] Merge with Achims version --- scripts/Bootstrap/Pmodules/libpmodules.bash | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/scripts/Bootstrap/Pmodules/libpmodules.bash b/scripts/Bootstrap/Pmodules/libpmodules.bash index 783ec24..d3a05a0 100644 --- a/scripts/Bootstrap/Pmodules/libpmodules.bash +++ b/scripts/Bootstrap/Pmodules/libpmodules.bash @@ -28,12 +28,6 @@ debug() { die() { local -ri ec=$1 shift - local cout - if (( ec == 0)); then - cout='1' - else - cout='2' - fi if [[ -n $@ ]]; then local -r fmt=$1 shift @@ -52,7 +46,7 @@ get_YN_answer() { local ans read -p "${prompt}" ans case ${ans} in - y|Y ) + y|Y ) return 0;; * ) return 1;; @@ -90,6 +84,7 @@ initialized properly!" check_pmodules_directories() { local -r src_prefix="$1" + [[ -d "${src_prefix}" ]] && [[ -d "${src_prefix}/${PSI_CONFIG_DIR}" ]] && [[ -d "${src_prefix}/${PSI_MODULES_ROOT}" ]] &&