From 1e57c3248d0583aeff90fd74b3521a0363a32a74 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 9 Jan 2014 09:05:02 +0000 Subject: pkg: use pre-inialized abuild vars --- aports/pkg.lua | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/aports/pkg.lua b/aports/pkg.lua index 4421936..b2b25d1 100644 --- a/aports/pkg.lua +++ b/aports/pkg.lua @@ -1,7 +1,6 @@ local M = {} local abuild = require('aports.abuild') -local abuild_arch = abuild.get_arch() -- return a key list with makedepends and depends function M.all_deps(p) @@ -79,13 +78,11 @@ function M.get_apk_file_name(pkg) end function M.get_apk_file_path(pkg) - local pkgdest = abuild.get_conf("PKGDEST") - if pkgdest ~= nil and pkgdest ~= "" then - return pkgdest.."/"..M.get_apk_file_name(pkg) + if abuild.pkgdest ~= nil and abuild.pkgdest ~= "" then + return abuild.pkgdest.."/"..M.get_apk_file_name(pkg) end - local repodest = abuild.get_conf("REPODEST") - if repodest ~= nil and repodest ~= "" then - return repodest.."/"..M.get_repo_name(pkg).."/"..abuild_arch.."/"..M.get_apk_file_name(pkg) + if abuild.repodest ~= nil and abuild.epodest ~= "" then + return abuild.repodest.."/"..M.get_repo_name(pkg).."/"..abuild.arch.."/"..M.get_apk_file_name(pkg) end return pkg.dir.."/"..M.get_apk_file_name(pkg) end -- cgit v1.2.3