diff options
| -rwxr-xr-x | bin/buildrepo.lua | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/bin/buildrepo.lua b/bin/buildrepo.lua index 5b5906d..48820c2 100755 --- a/bin/buildrepo.lua +++ b/bin/buildrepo.lua @@ -158,7 +158,7 @@ conf.arch = abuild.arch 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) +conf.repodest = opts.d or conf.repodest or abuild.repodest or ("%s/packages"):format(homedir) conf.logdir = opts.l or conf.logdir if opts.n then @@ -167,7 +167,7 @@ end local stats = {} for _, repo in pairs(args) do - local db = require('aports.db').new(aportsdir, repo, repodest) + local db = require('aports.db').new(aportsdir, repo, conf.repodest) local pkgs = {} local unsorted = {} stats[repo] = {} @@ -191,7 +191,7 @@ for _, repo in pairs(args) do stats[repo].total_aports = total_aports -- run prerepo hooks - plugins_prerepo(repo, aportsdir, repodest, abuild.arch, stats[repo], opts) + plugins_prerepo(repo, aportsdir, conf.repodest, abuild.arch, stats[repo], opts) -- find out what needs to be built for aport in db:each_need_build() do @@ -218,9 +218,9 @@ for _, repo in pairs(args) do warn("%s: Skipped due to missing dependencies", aport.pkgname) elseif not (opts.s and skip_aport(aport)) then log_progress(progress, repo, aport) - plugins_prebuild(aport, progress, repodest, abuild.arch, logfile, opts) - local success = build_aport(aport, repodest, logfile, opts.R) - plugins_postbuild(aport, success, repodest, abuild.arch, logfile, opts) + plugins_prebuild(aport, progress, conf.repodest, abuild.arch, logfile, opts) + local success = build_aport(aport, conf.repodest, logfile, opts.R) + plugins_postbuild(aport, success, conf.repodest, abuild.arch, logfile, opts) if success then built = built + 1 end @@ -237,7 +237,7 @@ for _, repo in pairs(args) do for aport, name in db:each() do keep[aport:get_apk_file_name(name)] = true end - local apkrepodir = ("%s/%s/%s"):format(repodest, repo, abuild.arch) + local apkrepodir = ("%s/%s/%s"):format(conf.repodest, repo, abuild.arch) for file in lfs.dir(apkrepodir) do if file:match("%.apk$") and not keep[file] then info("Deleting %s", file) @@ -252,7 +252,7 @@ for _, repo in pairs(args) do -- generate new apkindex if not opts.n and (built > 0 or deleted > 0) then info("Updating apk index") - apkrepo.update_index(("%s/%s"):format(repodest, repo), + apkrepo.update_index(("%s/%s"):format(conf.repodest, repo), abuild.arch, db:git_describe()) end stats[repo].built = built @@ -261,7 +261,7 @@ for _, repo in pairs(args) do stats[repo].time = os.clock() - start_time -- run portrepo hooks - plugins_postrepo(repo, aportsdir, repodest, abuild.arch, stats[repo], opts) + plugins_postrepo(repo, aportsdir, conf.repodest, abuild.arch, stats[repo], opts) end for repo, stat in pairs(stats) do |