From 340c006dff1ef6fddb0ac5595bfd74c5572e6484 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 9 Jan 2019 11:40:52 +0000 Subject: buildrepo: set default plugins dir to /usr/share/buildrepo/plugins and make it possible to override in config --- bin/buildrepo.lua | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/bin/buildrepo.lua b/bin/buildrepo.lua index 0b9f494..a833d03 100755 --- a/bin/buildrepo.lua +++ b/bin/buildrepo.lua @@ -5,7 +5,6 @@ local apkrepo = require("aports.apkrepo") local lfs = require("lfs") local optarg = require("optarg") -local pluginsdir = "/etc/buildrepo/plugins.d" local conf = {} local function warn(formatstr, ...) @@ -57,19 +56,19 @@ local function run_plugins(dirpath, func, ...) end local function plugins_prebuild(...) - return run_plugins(pluginsdir, "prebuild", ...) + return run_plugins(conf.pluginsdir, "prebuild", ...) end local function plugins_postbuild(...) - return run_plugins(pluginsdir, "postbuild", ...) + return run_plugins(conf.pluginsdir, "postbuild", ...) end local function plugins_prerepo(...) - return run_plugins(pluginsdir, "prerepo", ...) + return run_plugins(conf.pluginsdir, "prerepo", ...) end local function plugins_postrepo(...) - return run_plugins(pluginsdir, "postrepo", ...) + return run_plugins(conf.pluginsdir, "postrepo", ...) end local function logfile_path(logdirbase, repo, aport) @@ -153,6 +152,8 @@ if f then f() end +conf.pluginsdir = conf.pluginsdir or "/usr/share/buildrepo/plugins" + local homedir = os.getenv("HOME") local aportsdir = opts.a or conf.aportsdir or ("%s/aports"):format(homedir) local repodest = opts.d or conf.repodest or abuild.repodest or ("%s/packages"):format(homedir) -- cgit v1.2.3