Change. Use require "resources.functions.config" to load config file.

Change. Move `script_dir` definition into config file.

resources/install/scripts/app.lua

@@ -25,9 +25,7 @@
 
 
 --include config.lua
-	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/functions/config.lua");
-	dofile(config());
+	require "resources.functions.config";
 
 --get the argv values
 	script_name = argv[0];

resources/install/scripts/app/conference_center/resources/scripts/start_recording.lua

@@ -1,7 +1,5 @@
 --get the scripts directory and include the config.lua
-	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/functions/config.lua");
-	dofile(config());
+	require "resources.functions.config";
 
 --additional includes
 	dofile(scripts_dir.."/resources/functions/file_exists.lua");

resources/install/scripts/app/fax/resources/scripts/hangup_rx.lua

@@ -26,9 +26,7 @@
 	api = freeswitch.API();
 
 --include config.lua
-	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/functions/config.lua");
-	dofile(config());
+	require "resources.functions.config";
 
 --connect to the database
 	dofile(scripts_dir.."/resources/functions/database_handle.lua");

resources/install/scripts/app/provision/index.lua

@@ -44,11 +44,6 @@
 	tries = 0;
 	profile = "internal";
 
---include config.lua
-	--scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	--dofile(scripts_dir.."/resources/functions/config.lua");
-	--dofile(config());
-
 --connect to the database
 	dofile(scripts_dir.."/resources/functions/database_handle.lua");
 	dbh = database_handle('system');

resources/install/scripts/app/ring_groups/resources/scripts/confirm.lua

@@ -23,7 +23,7 @@
 --	Mark J Crane <markjcrane@fusionpbx.com>
 
 --include config.lua
-	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
+	require "resources.functions.config";
 
 --set variables
 	max_tries = "3";

resources/install/scripts/app/voicemail/resources/scripts/mwi.lua

@@ -24,9 +24,7 @@
 --	POSSIBILITY OF SUCH DAMAGE.
 
 --include the lua script
-	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/functions/config.lua");
-	dofile(config());
+	require "resources.functions.config";
 
 --define general settings
 	sleep = 300;

resources/install/scripts/call_flow.lua

@@ -29,9 +29,7 @@
 	digit_timeout = "5000";
 
 --include config.lua
-	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/functions/config.lua");
-	dofile(config());
+	require "resources.functions.config";
 
 --connect to the database
 	dofile(scripts_dir.."/resources/functions/database_handle.lua");

resources/install/scripts/call_flow_monitor.lua

@@ -32,9 +32,7 @@
 	debug["sql"] = false;
 
 --include config.lua
-	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/functions/config.lua");
-	dofile(config());
+	require "resources.functions.config";
 
 --general functions
 	dofile(scripts_dir.."/resources/functions/file_exists.lua");

resources/install/scripts/call_forward.lua

@@ -51,9 +51,7 @@
 	api = freeswitch.API();
 
 --include config.lua
-	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/functions/config.lua");
-	dofile(config());
+	require "resources.functions.config";
 
 --check if the session is ready
 	if (session:ready()) then

resources/install/scripts/cidlookup.lua

@@ -79,9 +79,7 @@
 	end;
 
 --include config.lua
-	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/functions/config.lua");
-	dofile(config());
+	require "resources.functions.config";
 
 --check if the session is ready
 	

resources/install/scripts/destination_caller_id.lua

@@ -25,9 +25,7 @@
 --	POSSIBILITY OF SUCH DAMAGE.
 
 --include config.lua
-	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/functions/config.lua");
-	dofile(config());
+	require "resources.functions.config";
 
 --connect to the database
 	dofile(scripts_dir.."/resources/functions/database_handle.lua");

resources/install/scripts/dial_string.lua

@@ -34,9 +34,7 @@
 	db_extension_uuid = "";
 
 --include config.lua
-	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/functions/config.lua");
-	dofile(config());
+	require "resources.functions.config";
 
 --connect to the database
 	dofile(scripts_dir.."/resources/functions/database_handle.lua");

resources/install/scripts/directory.lua

@@ -34,14 +34,7 @@
 	search_count = 0;
 
 --include config.lua
-	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/functions/config.lua");
-	dofile(config());
-
---include config.lua
-	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/functions/config.lua");
-	dofile(config());
+	require "resources.functions.config";
 
 --connect to the database
 	dofile(scripts_dir.."/resources/functions/database_handle.lua");

resources/install/scripts/disa.callback.loopback.lua

@@ -27,9 +27,7 @@
 	debug["sql"] = true;
 
 --include config.lua
-	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/functions/config.lua");
-	dofile(config());
+	require "resources.functions.config";
 
 --connect to the database
 	dofile(scripts_dir.."/resources/functions/database_handle.lua");

resources/install/scripts/disa.callback.lua

@@ -27,9 +27,7 @@
 	debug["sql"] = false;
 
 --include config.lua
-	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/functions/config.lua");
-	dofile(config());
+	require "resources.functions.config";
 
 --connect to the database
 	dofile(scripts_dir.."/resources/functions/database_handle.lua");

resources/install/scripts/disa.plus.lua

@@ -31,9 +31,7 @@ digit_timeout = "5000";
 	debug["sql"] = true;
 
 --include config.lua
-	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/functions/config.lua");
-	dofile(config());
+	require "resources.functions.config";
 
 --connect to the database
 	dofile(scripts_dir.."/resources/functions/database_handle.lua");

resources/install/scripts/do_not_disturb.lua

@@ -51,9 +51,7 @@
 	api = freeswitch.API();
 
 --include config.lua
-	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/functions/config.lua");
-	dofile(config());
+	require "resources.functions.config";
 
 --check if the session is ready
 	if ( session:ready() ) then

resources/install/scripts/eavesdrop.lua

@@ -28,9 +28,7 @@ digit_timeout = "5000";
 extension = argv[1];
 
 --include config.lua
-	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/functions/config.lua");
-	dofile(config());
+	require "resources.functions.config";
 
 --add the file_exists function
 	dofile(scripts_dir.."/resources/functions/file_exists.lua");

resources/install/scripts/extension_queue.lua

@@ -24,9 +24,7 @@
 --	Riccardo Granchi <riccardo.granchi@nems.it>
 
 --include config.lua
-	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/functions/config.lua");
-	dofile(config());
+	require "resources.functions.config";
 
 --connect to the database
 	dofile(scripts_dir.."/resources/functions/database_handle.lua");

resources/install/scripts/fax_retry.lua

@@ -31,9 +31,7 @@
 	api = freeswitch.API();
 
 --include config.lua
-	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/functions/config.lua");
-	dofile(config());
+	require "resources.functions.config";
 
 --connect to the database
 	dofile(scripts_dir.."/resources/functions/database_handle.lua");

resources/install/scripts/follow_me.lua

@@ -51,9 +51,7 @@
 	api = freeswitch.API();
 
 --include config.lua
-	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/functions/config.lua");
-	dofile(config());
+	require "resources.functions.config";
 
 --check if the session is ready
 	if ( session:ready() ) then

resources/install/scripts/intercept.lua

@@ -32,9 +32,7 @@
 	debug["sql"] = false;
 
 --include config.lua
-	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/functions/config.lua");
-	dofile(config());
+	require "resources.functions.config";
 
 --connect to the database
 	if (file_exists(database_dir.."/core.db")) then

resources/install/scripts/intercept_group.lua

@@ -31,9 +31,7 @@
 	debug["sql"] = false;
 
 --include config.lua
-	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/functions/config.lua");
-	dofile(config());
+	require "resources.functions.config";
 
 --add the function
 	dofile(scripts_dir.."/resources/functions/explode.lua");

resources/install/scripts/ivr_menu.lua

@@ -32,9 +32,7 @@
 	debug["tries"] = false;
 
 --include config.lua
-	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/functions/config.lua");
-	dofile(config());
+	require "resources.functions.config";
 
 --connect to the database
 	dofile(scripts_dir.."/resources/functions/database_handle.lua");

resources/install/scripts/park.lua

@@ -15,9 +15,7 @@
 		--action	lua		park.lua
 
 --include config.lua
-	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/functions/config.lua");
-	dofile(config());
+	require "resources.functions.config";
 
 --connect to the database
 	--dbh = freeswitch.Dbh("core:core"); -- when using sqlite

resources/install/scripts/park_monitor.lua

@@ -29,9 +29,7 @@
 	--then send presence terminate, and delete from the database
 
 --include config.lua
-	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/functions/config.lua");
-	dofile(config());
+	require "resources.functions.config";
 
 --connect to the database
 	--dbh = freeswitch.Dbh("core:core"); -- when using sqlite

resources/install/scripts/recordings.lua

@@ -34,9 +34,7 @@
 	recording_prefix = "";
 
 --include config.lua
-	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/functions/config.lua");
-	dofile(config());
+	require "resources.functions.config";
 
 --connect to the database
 	dofile(scripts_dir.."/resources/functions/database_handle.lua");

resources/install/scripts/resources/functions/config.lua

@@ -1,12 +1,26 @@
 
+-- add file_exists function
+	require "resources.functions.file_exists";
+
 --find and return path to the config.lua
 	function config()
-		dofile(scripts_dir.."/resources/functions/file_exists.lua");
 		if (file_exists("/etc/fusionpbx/config.lua")) then
 			return "/etc/fusionpbx/config.lua";
 		elseif (file_exists("/usr/local/etc/fusionpbx/config.lua")) then
 			return "/usr/local/etc/fusionpbx/config.lua";
 		else
-			return scripts_dir.."/resources/config.lua";
+			return "resources.config";
 		end
-	end
+	end
+
+-- load config
+	function load_config()
+		local cfg = config()
+		if cfg:sub(1,1) == '//' then
+			dofile(cfg)
+		else
+			require(cfg)
+		end
+	end
+
+	load_config()

resources/install/scripts/streamfile.lua

@@ -3,9 +3,7 @@
 	file_name = argv[1];
 
 --include config.lua
-	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/functions/config.lua");
-	dofile(config());
+	require "resources.functions.config";
 
 --connect to the database
 	dofile(scripts_dir.."/resources/functions/database_handle.lua");