Modified apk-tools to use updated apk.lua library. Available now shows a version to allow for updates.

git-svn-id: svn://svn.alpinelinux.org/acf/apk-tools/trunk@1301 ab2d0c66-481e-0410-8bed-d214d4d58bed

1 files changed, 7 insertions, 7 deletions

diff --git a/apk-model.lua b/apk-model.lua
index 53b3c9f..f26fbb8 100644
--- a/apk-model.lua
+++ b/apk-model.lua
@@ -7,27 +7,27 @@ local configfile = "/etc/apk/apk.conf"
 
 get_all_packages = function()
 	-- read in all of the packages
-	return cfe({ type="list", value=apk.get_all_packages(), label="All Packages"})
+	return cfe({ type="list", value=apk.get_all(), label="All Packages"})
 end
 
 get_loaded_packages = function()
 	-- read in the loaded packages
-	return cfe({ type="list", value=apk.get_loaded_packages(), label="Loaded Packages"})
+	return cfe({ type="list", value=apk.get_loaded(), label="Loaded Packages"})
 end
 
 get_available_packages = function()
 	-- available are all except loaded
-	return cfe({ type="list", value=apk.get_available_packages(), label="Available Packages" })
+	return cfe({ type="list", value=apk.get_available(), label="Available Packages" })
 end
 
 get_packages = function()
-	local loaded = get_loaded_packages()
-	local available = get_available_packages(loaded)
+	local loaded = get_loaded()
+	local available = get_available()
 	return cfe({ type="group", value={loaded=loaded, available=available} })
 end
 
 delete_package = function(package, sessiondata)
-	local success, cmdresult = apk.delete_package(package)
+	local success, cmdresult = apk.delete(package)
 	if success then
 		-- Destroy menu and permissions info in session so recalculated
 		if sessiondata then sessiondata.menu = nil end
@@ -37,7 +37,7 @@ delete_package = function(package, sessiondata)
 end
 
 install_package = function(package,sessiondata)
-	local success, cmdresult = apk.install_package(package)
+	local success, cmdresult = apk.install(package)
 	if success then
 		-- Destroy menu and permissions info in session so recalculated
 		if sessiondata then sessiondata.menu = nil end