Merge 0.12->trunk

1 files changed, 8 insertions, 1 deletions

diff --git a/prosodyctl b/prosodyctl
index 4e4099d5..cb55858a 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -44,6 +44,13 @@ end
 
 -----------
 
+-- Check before first require, to preempt the probable failure
+if _VERSION < "Lua 5.2" then
+	io.stderr:write("Prosody is no longer compatible with Lua 5.1\n")
+	io.stderr:write("See https://prosody.im/doc/depends#lua for more information\n")
+	return os.exit(1);
+end
+
 local startup = require "util.startup";
 startup.prosodyctl();
 
@@ -573,7 +580,7 @@ function commands.reload(arg)
 end
 -- ejabberdctl compatibility
 
-local unpack = table.unpack or unpack; -- luacheck: ignore 113
+local unpack = table.unpack;
 
 function commands.register(arg)
 	local user, host, password = unpack(arg);