[svn-commits] mnicholson: branch mnicholson/asttest r247383 - /team/mnicholson/asttest/astt...

[SVN commits to the Digium repositories]

Author: mnicholson
Date: Wed Feb 17 16:56:25 2010
New Revision: 247383

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=247383
Log:
Convert lua/astlib.lua to use asterisk:path()

Modified:
    team/mnicholson/asttest/asttest/lua/astlib.lua

Modified: team/mnicholson/asttest/asttest/lua/astlib.lua
URL: http://svnview.digium.com/svn/asterisk/team/mnicholson/asttest/asttest/lua/astlib.lua?view=diff&rev=247383&r1=247382&r2=247383
==============================================================================
--- team/mnicholson/asttest/asttest/lua/astlib.lua (original)
+++ team/mnicholson/asttest/asttest/lua/astlib.lua Wed Feb 17 16:56:25 2010
@@ -115,13 +115,13 @@
 		end
 	end
 
-	local c = config:from_file(conf_name, file, self.work_area .. "/etc/asterisk/" .. conf_name)
+	local c = config:from_file(conf_name, file, self:path("/etc/asterisk/") .. conf_name)
 	self[conf_name] = c
 	return c
 end
 
 function asterisk:new_config(name)
-	local c = config:new(name, self.work_area .. "/etc/asterisk/" .. name)
+	local c = config:new(name, self:path("/etc/asterisk/") .. name)
 	self[name] = c
 	return c
 end
@@ -139,16 +139,16 @@
 
 	local c = self:new_config("asterisk.conf")
 	local s = c:new_section("directories")
-	s["astetcdir"] = self.work_area .. "/etc/asterisk"
-	s["astmoddir"] = self.work_area .. "/lib/asterisk/modules"
-	s["astvarlibdir"] = self.work_area .. "/var/lib/asterisk"
-	s["astdbdir"] = self.work_area .. "/var/lib/asterisk"
-	s["astkeydir"] = self.work_area .. "/var/lib/asterisk"
-	s["astdatadir"] = self.work_area .. "/var/lib/asterisk"
-	s["astagidir"] = self.work_area .. "/var/lib/asterisk/agi-bin"
-	s["astspooldir"] = self.work_area .. "/var/spool/asterisk"
-	s["astrundir"] = self.work_area .. "/var/run"
-	s["astlogdir"] = self.work_area .. "/var/log/asterisk"
+	s["astetcdir"] = self:path("/etc/asterisk")
+	s["astmoddir"] = self:path("/lib/asterisk/modules")
+	s["astvarlibdir"] = self:path("/var/lib/asterisk")
+	s["astdbdir"] = self:path("/var/lib/asterisk")
+	s["astkeydir"] = self:path("/var/lib/asterisk")
+	s["astdatadir"] = self:path("/var/lib/asterisk")
+	s["astagidir"] = self:path("/var/lib/asterisk/agi-bin")
+	s["astspooldir"] = self:path("/var/spool/asterisk")
+	s["astrundir"] = self:path("/var/run")
+	s["astlogdir"] = self:path("/var/log/asterisk")
 
 	s = c:new_section("options")
 	s["documentation_language"] = "en_US"