diff options
Diffstat (limited to 'src/lib/conf.sh.in')
| -rw-r--r-- | src/lib/conf.sh.in | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/conf.sh.in b/src/lib/conf.sh.in index 7d1646b..f2d515d 100644 --- a/src/lib/conf.sh.in +++ b/src/lib/conf.sh.in @@ -109,7 +109,7 @@ list_envvars() { # Loads the configuration files for $slug in the proper order, and # optionally verify that certain variables are set. load_conf() { - [[ "$1" = *.conf ]] || libremessages panic || exit 1 + [[ "$1" = *.conf ]] || libremessages panic || exit 1 # $EXIT_FAILURE local slug=${1%.conf} shift @@ -123,7 +123,7 @@ load_conf() { # Load the files while read -r file; do if [[ -r $file ]]; then - . "$file" || return 6 + . "$file" || return 6 # $EXIT_NOTCONFIGURED fi done < <(list_files "$slug") @@ -133,7 +133,7 @@ load_conf() { done < <(list_envvars "$slug") # Verify that the variables we need were set - declare -i ret=0 + declare -i ret=0 # $EXIT_SUCCESS for var in "$@"; do if [[ -z ${!var:-} ]]; then if [[ $(list_files "$slug"|wc -l) -gt 1 ]]; then @@ -142,7 +142,7 @@ load_conf() { else libremessages _l print "Configure '%s' in '%s'" "$var" "$(list_files "$slug")" fi - ret=6 + ret=6 # $EXIT_NOTCONFIGURED fi done >&2 return $ret @@ -170,10 +170,10 @@ set_var() { if [[ -w $file ]]; then sed -i "/^\s*$key=/d" "$file" printf '%s=%q\n' "$key" "$val" >> "$file" - return 0 + return 0 # $EXIT_SUCCESS fi done < <(list_files "$slug"|tac) - return 1 + return 1 # $EXIT_FAILURE } # PKGBUILD (not configuration, per se) ######################################### |