From cfa81e5f309d4869e581208abb1c1bdb98231333 Mon Sep 17 00:00:00 2001 From: Matthias Fulz Date: Tue, 29 Jun 2021 22:51:24 +0200 Subject: [PATCH] added wrapper --- Makefile | 3 ++- archbuilder.in | 2 ++ archbuilderwrap | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 archbuilderwrap diff --git a/Makefile b/Makefile index 81f35ed..a50f56e 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ LIBDIR ?= $(PREFIX)/lib CNFDIR ?= /etc ARCHBUILDER_LIB_DIR ?= $(LIBDIR)/$(PROGNM) ARCHBUILDER_CONF_DIR ?= $(CNFDIR)/$(PROGNM) -ARCHBUILDER_VERSION ?= 0.9.1 +ARCHBUILDER_VERSION ?= 0.9.2 .PHONY: install build archbuilder @@ -19,6 +19,7 @@ archbuilder: archbuilder.in install-archbuilder: archbuilder @install -Dm755 archbuilder -t '$(DESTDIR)$(BINDIR)' + @install -Dm755 archbuilderwrap -t '$(DESTDIR)$(BINDIR)' install: install-archbuilder @install -Dm644 lib/archbuilder.inc.sh -t '$(DESTDIR)$(LIBDIR)/$(PROGNM)' diff --git a/archbuilder.in b/archbuilder.in index 72baa9b..6eec43c 100644 --- a/archbuilder.in +++ b/archbuilder.in @@ -12,6 +12,8 @@ readonly conf_dir='ARCHBUILDER_CONF_DIR' . "${lib_dir}/archbuilder.inc.sh" . "${lib_dir}/buildah.inc.sh" +test_file "${HOME}/.archbuilder/archbuilder.env" \ + && . "${HOME}/.archbuilder/archbuilder.env" # internal params unset _FLAG_KEEP diff --git a/archbuilderwrap b/archbuilderwrap new file mode 100644 index 0000000..6bb652b --- /dev/null +++ b/archbuilderwrap @@ -0,0 +1,3 @@ +#!/bin/bash + +archbuilder ${ARCHBUILDER_FLAGS} -- $*