X-Git-Url: http://git.tuebingen.mpg.de/?p=gsu.git;a=blobdiff_plain;f=config;h=34352e2427efc140170e2691f27f841acc075db3;hp=09330f355cc5b16d8cb0288760f3c620f92c65ef;hb=a67f16ae830226c7afef2f3fad72efe46f3b5ed9;hpb=f31cc416b1acdbb8f5703b208d943ce500a5b840;ds=sidebyside diff --git a/config b/config index 09330f3..34352e2 100644 --- a/config +++ b/config @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright (C) 2006 Andre Noll +# Licensed under the LGPL, version 3. See COPYING and COPYING.LESSER. # Syntactically check the gsu_options array for errors and parse the config # file. @@ -27,7 +29,7 @@ gsu_check_options() result="name: '$name'" # bash's =~ works only for 3.2 and newer, so use grep echo "$name" | grep '^[a-zA-Z][a-zA-Z_0123456789]*$' &> /dev/null; - [[ $? -ne 0 ]] && return + (($? != 0)) && return eval orig_val='"'\$orig_${gsu_config_var_prefix}_$name'"' if [[ -z "$orig_val" ]]; then @@ -57,7 +59,7 @@ gsu_check_options() ;; num) gsu_is_a_number "$val" - [[ $ret -lt 0 ]] && return + (($ret < 0)) && return ;; *) ret=-$E_GSU_BAD_OPTION_TYPE @@ -79,7 +81,7 @@ gsu_check_options_or_die() } if [[ "$(type -t _gsu_setup)" != "function" ]]; then - gsu_dir=${gsu_dir:=${HOME:-}/.gsu} + gsu_dir=${gsu_dir:-${BASH_SOURCE[0]%/*}} . $gsu_dir/common || exit 1 _gsu_setup fi