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/abslibre-tools/libredbdiff | |
| parent | d712e575c0d5b1bf66443beec3e7ed75be636e2d (diff) | |
Merge conf.sh:load_files and conf.sh:check_vars into load_conf
Diffstat (limited to 'src/abslibre-tools/libredbdiff')
| -rwxr-xr-x | src/abslibre-tools/libredbdiff | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/abslibre-tools/libredbdiff b/src/abslibre-tools/libredbdiff index 1903c8c..5d301f6 100755 --- a/src/abslibre-tools/libredbdiff +++ b/src/abslibre-tools/libredbdiff @@ -22,7 +22,6 @@ set -euE -o pipefail . "$(librelib messages)" . "$(librelib conf)" -load_files libredbdiff || exit setup_traps declare -r name="Libredbdiff" @@ -245,7 +244,7 @@ main_update() { usage >&2 exit 1 fi - check_vars libredbdiff statedir mirror_prbl mirror_arch || exit 1 + load_conf libredbdiff.conf statedir mirror_prbl mirror_arch || exit createdir "$statedir" { @@ -297,7 +296,7 @@ main_update() { } main_compare() { - check_vars libredbdiff statedir repos || exit 1 + load_conf libredbdiff.conf statedir repos || exit if ! [[ -f "$conffile_prbl" && \ -f "$conffile_arch" && \ |