aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2023-03-17 16:29:07 +0100
committerKim Alvefur <zash@zash.se>2023-03-17 16:29:07 +0100
commit763a2bb0ed5f2c134c4efa0dfbcfa8ff73a0530f (patch)
tree6b4aeda1a261bf2ca801731ac281c790810e0b22
parentfc80e83b42c04f8b3407487a97e663ae0b4d82fc (diff)
downloadprosody-763a2bb0ed5f2c134c4efa0dfbcfa8ff73a0530f.tar.gz
prosody-763a2bb0ed5f2c134c4efa0dfbcfa8ff73a0530f.zip
executables: Invoke loader to allow mixing of old and new import style
Now both require"util.foo" and require"prosody.util.foo" should be equivalent.
-rwxr-xr-xprosody4
-rwxr-xr-xprosodyctl4
2 files changed, 8 insertions, 0 deletions
diff --git a/prosody b/prosody
index eaac3dff..b300059f 100755
--- a/prosody
+++ b/prosody
@@ -51,6 +51,10 @@ if _VERSION < "Lua 5.2" then
return os.exit(1);
end
+if not pcall(require, "prosody.loader") then
+ pcall(require, "loader");
+end
+
local startup = require "util.startup";
local async = require "util.async";
diff --git a/prosodyctl b/prosodyctl
index 337b3593..55d71cf6 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -51,6 +51,10 @@ if _VERSION < "Lua 5.2" then
return os.exit(1);
end
+if not pcall(require, "prosody.loader") then
+ pcall(require, "loader");
+end
+
local startup = require "util.startup";
startup.prosodyctl();