diff prosodyctl @ 14064:76ece4dd9782

loader: Move all path setup here from all executables So it is done in the same way for all the executables, with less code duplication.
author Kim Alvefur <zash@zash.se>
date Mon, 09 Feb 2026 01:57:40 +0100
parents f20b3f0d892b
children 50b8d732c905
line wrap: on
line diff
--- a/prosodyctl	Mon Feb 09 01:57:07 2026 +0100
+++ b/prosodyctl	Mon Feb 09 01:57:40 2026 +0100
@@ -24,24 +24,9 @@
 	return os.exit(1);
 end
 
-
 -- Tell Lua where to find our libraries
 if CFG_SOURCEDIR then
 	-- Installed instance
-	local function is_relative(path)
-		local path_sep = package.config:sub(1,1);
-		return ((path_sep == "/" and path:sub(1,1) ~= "/")
-			or (path_sep == "\\" and (path:sub(1,1) ~= "/" and path:sub(2,3) ~= ":\\")))
-	end
-	local function filter_relative_paths(path)
-		if is_relative(path) then return ""; end
-	end
-	local function sanitise_paths(paths)
-		return (paths:gsub("[^;]+;?", filter_relative_paths):gsub(";;+", ";"));
-	end
-	package.path = sanitise_paths(CFG_SOURCEDIR.."/?.lua;"..package.path);
-	package.cpath = sanitise_paths(CFG_SOURCEDIR.."/?.so;"..package.cpath);
-
 	require "prosody.loader";
 else
 	-- Not installed, e.g. running from a source checkout