# HG changeset patch # User Kim Alvefur # Date 1679066947 -3600 # Node ID 4f2accd99373946beada912f574c2462f4bb09e7 # Parent ebe3b2f96cad72e5358c2b60e289aa19a37ebc04 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. diff -r ebe3b2f96cad -r 4f2accd99373 prosody --- a/prosody Tue Mar 21 14:33:29 2023 +0000 +++ b/prosody Fri Mar 17 16:29:07 2023 +0100 @@ -51,6 +51,10 @@ 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 -r ebe3b2f96cad -r 4f2accd99373 prosodyctl --- a/prosodyctl Tue Mar 21 14:33:29 2023 +0000 +++ b/prosodyctl Fri Mar 17 16:29:07 2023 +0100 @@ -51,6 +51,10 @@ return os.exit(1); end +if not pcall(require, "prosody.loader") then + pcall(require, "loader"); +end + local startup = require "util.startup"; startup.prosodyctl();