From c9740f1fcf80ed25c1ab18bfba990c6d4fbe6b15 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Wed, 3 Mar 2010 20:12:24 +0000 Subject: prosodyctl: Fix to load LuaRocks 2.x if we have it --- prosodyctl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/prosodyctl b/prosodyctl index a44dfada..89368a78 100755 --- a/prosodyctl +++ b/prosodyctl @@ -30,7 +30,10 @@ if CFG_DATADIR then end -- Required to be able to find packages installed with luarocks -pcall(require, "luarocks.require") +if not pcall(require, "luarocks.loader") then -- Try LuaRocks 2.x + pcall(require, "luarocks.require") -- Try LuaRocks 1.x +end + config = require "core.configmanager" -- cgit v1.2.3