X-Git-Url: http://git.tuebingen.mpg.de/?p=gsu.git;a=blobdiff_plain;f=config;h=70a83f1e59372765bed900ce9b9fd13dafcc7bc1;hp=caaf39dc2c537c01c975ac0f16006bb85b06d6d2;hb=HEAD;hpb=06c59d15434c5d0ea5757bfd4322d74f960dba57 diff --git a/config b/config index caaf39d..6152679 100644 --- a/config +++ b/config @@ -6,7 +6,7 @@ # file. gsu_check_options() { - local i conf="${gsu_config_file:=${HOME:-}/.$gsu_name.rc}" val orig_val + local i f conf="${gsu_config_file:=${HOME:-}/.$gsu_name.rc}" val orig_val local name option_type default_value required description help_text for ((i=0; i < ${#gsu_options[@]}; i++)); do @@ -15,7 +15,9 @@ gsu_check_options() eval orig_${gsu_config_var_prefix}_$name='"'${val}'"' done - [[ -r "$conf" ]] && source "$conf" + for f in $conf; do + [[ -r "$f" ]] && source "$f" + done for ((i=0; i < ${#gsu_options[@]}; i++)); do name= @@ -61,7 +63,7 @@ gsu_check_options() ;; num) gsu_is_a_number "$val" - (($ret < 0)) && return + ((ret < 0)) && return ;; *) ret=-$E_GSU_BAD_OPTION_TYPE @@ -76,7 +78,7 @@ gsu_check_options() gsu_check_options_or_die() { gsu_check_options - if (($ret < 0)); then + if ((ret < 0)); then gsu_err_msg exit 1 fi @@ -84,6 +86,6 @@ gsu_check_options_or_die() if [[ "$(type -t _gsu_setup)" != "function" ]]; then gsu_dir=${gsu_dir:-${BASH_SOURCE[0]%/*}} - . $gsu_dir/common || exit 1 + . "$gsu_dir/common" || exit 1 _gsu_setup fi