Remove all calls to 'module' in preparation for move to Lua 5.2

Use mymodule parameter for module definition.
This was also helpful in revealing places where the code relied on the global environment.

1 files changed, 14 insertions, 13 deletions

diff --git a/apk-controller.lua b/apk-controller.lua
index 5ccd137..70e82bf 100644
--- a/apk-controller.lua
+++ b/apk-controller.lua
@@ -1,45 +1,46 @@
 -- the apk controller
+local mymodule = {}
 
-module (..., package.seeall)
+mymodule.default_action = "loaded"
 
-default_action = "loaded"
-
-loaded = function(self)
+mymodule.loaded = function(self)
 	return self.model.get_loaded_packages()
 end
 
-available = function(self)
+mymodule.available = function(self)
 	return self.model.get_available_packages()
 end
 
-details = function(self)
+mymodule.details = function(self)
 	return self.model.get_package_details(self.clientdata.package)
 end
 
-delete = function(self)
+mymodule.delete = function(self)
 	return self.handle_form(self, self.model.get_delete_package, self.model.delete_package, self.clientdata, "Delete", "Delete Package")
 end
 
-install = function(self)
+mymodule.install = function(self)
 	return self.handle_form(self, self.model.get_install_package, self.model.install_package, self.clientdata, "Install", "Install Package")
 end
 
-upgrade = function(self)
+mymodule.upgrade = function(self)
 	return self.handle_form(self, self.model.get_upgrade_package, self.model.upgrade_package, self.clientdata, "Upgrade", "Upgrade Package")
 end
 
-cache = function(self)
+mymodule.cache = function(self)
 	return self.handle_form(self, self.model.get_cache, self.model.update_cache, self.clientdata, "Save", "Edit Cache Settings", "Settings Saved")
 end
 
-expert = function(self)
+mymodule.expert = function(self)
 	return self.handle_form(self, self.model.get_configfile, self.model.update_configfile, self.clientdata, "Save", "Edit Configuration", "Configuration Saved")
 end
 
-updateall = function(self)
+mymodule.updateall = function(self)
 	return self.handle_form(self, self.model.get_update_all, self.model.update_all, self.clientdata, "Update All", "Update All Packages")
 end
 
-upgradeall = function(self)
+mymodule.upgradeall = function(self)
 	return self.handle_form(self, self.model.get_upgrade_all, self.model.upgrade_all, self.clientdata, "Upgrade All", "Upgrade All Packages")
 end
+
+return mymodule