diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2017-05-24 15:17:59 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2017-05-24 16:24:13 -0400 |
| commit | 05128d533225b75f35f79a1f55b04556b7e9736b (patch) | |
| tree | a2e8d723e76fd8e44c81ea0fbe1ad4dda597856d /src/xbs/xbs | |
| parent | d712e575c0d5b1bf66443beec3e7ed75be636e2d (diff) | |
Merge conf.sh:load_files and conf.sh:check_vars into load_conf
Diffstat (limited to 'src/xbs/xbs')
| -rwxr-xr-x | src/xbs/xbs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/xbs/xbs b/src/xbs/xbs index 7200800..12c5770 100755 --- a/src/xbs/xbs +++ b/src/xbs/xbs @@ -140,11 +140,7 @@ main() { shift $((OPTIND - 1)) if [[ -z $BUILDSYSTEM ]]; then - load_files xbs || return 1 - check_vars xbs BUILDSYSTEM || { - prose 'or specify the `-b` flag.' >&2 - return 1 - } + load_conf xbs.conf BUILDSYSTEM || exit fi if [[ -z $XBS_LIBDIR ]]; then |