From bf7667ecdfd084fc062333ee52f9b96e694d6de0 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 31 Dec 2013 09:16:00 +0000
Subject: abuild: split out abuild conf related functions

---
 aports/abuild.lua | 26 ++++++++++++++++++++++++++
 aports/db.lua     | 32 +++++---------------------------
 2 files changed, 31 insertions(+), 27 deletions(-)
 create mode 100644 aports/abuild.lua

(limited to 'aports')

diff --git a/aports/abuild.lua b/aports/abuild.lua
new file mode 100644
index 0000000..a9fe8cc
--- /dev/null
+++ b/aports/abuild.lua
@@ -0,0 +1,26 @@
+
+local M = {}
+local abuild_conf = {}
+M.conf_file = "/etc/abuild.conf"
+M.functions = "/usr/share/abuild/functions.sh"
+
+function M.get_conf(var)
+	-- check cache
+	if abuild_conf[var] ~= nil then
+		return abuild_conf[var]
+	end
+
+	-- use os env var
+	abuild_conf[var] = os.getenv(var)
+	if abuild_conf[var] ~= nil then
+		return abuild_conf[var]
+	end
+
+	-- parse config file
+	local f = io.popen(" . "..M.conf_file..' ; echo -n "$'..var..'"')
+	abuild_conf[var] = f:read("*all")
+	f:close()
+	return abuild_conf[var]
+end
+
+return M
diff --git a/aports/db.lua b/aports/db.lua
index 971af86..9f8769f 100644
--- a/aports/db.lua
+++ b/aports/db.lua
@@ -1,29 +1,7 @@
 
-abuild_conf_file = "/etc/abuild.conf"
-abuild_functions = "/usr/share/abuild/functions.sh"
-
-local abuild_conf = {}
+local abuild = require('aports.abuild')
 local M = {}
 
-function M.get_abuild_conf(var)
-	-- check cache
-	if abuild_conf[var] ~= nil then
-		return abuild_conf[var]
-	end
-
-	-- use os env var
-	abuild_conf[var] = os.getenv(var)
-	if abuild_conf[var] ~= nil then
-		return abuild_conf[var]
-	end
-
-	-- parse config file
-	local f = io.popen(" . "..abuild_conf_file..' ; echo -n "$'..var..'"')
-	abuild_conf[var] = f:read("*all")
-	f:close()
-	return abuild_conf[var]
-end
-
 local function split_subpkgs(str)
 	local t = {}
 	local e
@@ -75,7 +53,7 @@ local function parse_apkbuilds(dirs)
 		str = str..v.."/*/APKBUILD "
 	end
 
-	local p = io.popen(". "..abuild_functions..";"..[[
+	local p = io.popen(". "..abuild.functions..";"..[[
 		for i in ]]..str..[[; do
 			pkgname=
 			pkgver=
@@ -181,13 +159,13 @@ function M.get_apk_filename(pkg)
 end
 
 function M.get_apk_file_path(pkg)
-	local pkgdest = get_abuild_conf("PKGDEST")
+	local pkgdest = abuild.get_conf("PKGDEST")
 	if pkgdest ~= nil and pkgdest ~= "" then
 		return pkgdest.."/"..M.get_apk_filename(pkg)
 	end
-	local repodest = M.get_abuild_conf("REPODEST")
+	local repodest = abuild.get_conf("REPODEST")
 	if repodest ~= nil and repodest ~= "" then
-		local arch = M.get_abuild_conf("CARCH")
+		local arch = abuild.get_conf("CARCH")
 		return repodest.."/"..M.get_repo_name(pkg).."/"..arch.."/"..M.get_apk_filename(pkg)
 	end
 	return pkg.dir.."/"..M.get_apk_filename(pkg)
-- 
cgit v1.2.3