Modified require statements for acf. libraries

7 files changed, 13 insertions, 14 deletions

diff --git a/alpineversion-model.lua b/alpineversion-model.lua
index 67a348c..ac20bb8 100644
--- a/alpineversion-model.lua
+++ b/alpineversion-model.lua
@@ -1,11 +1,9 @@
 -- alpineversion model methods
 module (..., package.seeall)
 
--- no initializer in model - use controller.init for that
-
+fs = fs = require("acf.fs")
 
 get = function ()
-	require("fs")
 	local liboutput = fs.read_file("/etc/alpine-release")
 	if (liboutput == nil) or (liboutput == "") then
 		liboutput = "Unknown version"
diff --git a/health-model.lua b/health-model.lua
index fb284bb..81d0bb4 100644
--- a/health-model.lua
+++ b/health-model.lua
@@ -1,9 +1,9 @@
 -- acf model for displaying logfiles recusivly 
 module (..., package.seeall)
 
-require("fs")
-require("date")
-require("format")
+fs = require("acf.fs")
+date = require("acf.date")
+format = require("acf.format")
 
 local path = "PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin "
 
diff --git a/hostname-model.lua b/hostname-model.lua
index debc7d9..6fafdc0 100644
--- a/hostname-model.lua
+++ b/hostname-model.lua
@@ -1,7 +1,7 @@
 -- hostname model methods
 module (..., package.seeall)
 
-require("fs")
+fs = require("acf.fs")
 
 get = function (fqdn)
 	local f,n
diff --git a/logfiles-model.lua b/logfiles-model.lua
index d68662c..c18fc1b 100644
--- a/logfiles-model.lua
+++ b/logfiles-model.lua
@@ -1,9 +1,10 @@
 -- acf model for displaying logfiles 
 module (..., package.seeall)
-require("fs")
+
 require("posix")
-require("format")
 require("modelfunctions")
+fs = require("acf.fs")
+format = require("acf.format")
 
 -- Function to get detailed information on a specific file.
 local function file_info ( path )
diff --git a/modules-model.lua b/modules-model.lua
index c5b1a39..aae8115 100644
--- a/modules-model.lua
+++ b/modules-model.lua
@@ -1,7 +1,7 @@
 module (..., package.seeall)
 
 require("modelfunctions")
-require("fs")
+fs = require("acf.fs")
 
 local configfile = "/etc/modules"
 
diff --git a/password-model.lua b/password-model.lua
index 8555768..4277a33 100644
--- a/password-model.lua
+++ b/password-model.lua
@@ -1,8 +1,8 @@
 -- password model methods
 module (..., package.seeall)
 
-require ("fs")
-require ("format")
+fs = require ("acf.fs")
+format = require ("acf.format")
 require ("posix")
 
 read_password = function()
diff --git a/rc-model.lua b/rc-model.lua
index 1046a96..f22f400 100644
--- a/rc-model.lua
+++ b/rc-model.lua
@@ -1,9 +1,9 @@
 module (..., package.seeall)
 
-require("processinfo")
+require("posix")
 require("modelfunctions")
+processinfo = require("acf.processinfo")
 fs = require("acf.fs")
-require("posix")
 
 local configpath = "/etc/runlevels/"
 local runlevels = {}