From bb6cc24d4a6a6ae49e46572d5cdf472c663df581 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 20 Jun 2017 21:45:09 -0400 Subject: adjust to be ready for the next version of conf.sh --- .local/bin/autobuild.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.local/bin/autobuild.sh b/.local/bin/autobuild.sh index 307f20f..3b2c652 100755 --- a/.local/bin/autobuild.sh +++ b/.local/bin/autobuild.sh @@ -44,8 +44,14 @@ main() { # Configuration parsing ################################################ . "$(librelib conf)" - load_files libretools - check_vars libretools WORKDIR ABSLIBRERECV ABSLIBRESEND + if type load_conf &>/dev/null; then + # new way + load_conf libretools.conf WORKDIR ABSLIBRERECV ABSLIBRESEND + else + # old way + load_files libretools + check_vars libretools WORKDIR ABSLIBRERECV ABSLIBRESEND + fi # Lock to pevent conflicting runs ###################################### lock 9 "${WORKDIR}/autobuilder.lock" "Waiting for previous run of %q to finish" "$0" -- cgit v1.2.3-54-g00ecf