# HG changeset patch # User João Duarte # Date 1561465254 -3600 # Node ID b59535964e81085b23ebc0c3938ebb1eb1c7dd4b # Parent 0780bcf51ba73ea85b1d79b7fecfc33ad6020d82 util.prosodyctl: Moved the 'admin_operation' function from prosodyctl to here diff -r 0780bcf51ba7 -r b59535964e81 prosodyctl --- a/prosodyctl Tue Jun 25 12:03:20 2019 +0100 +++ b/prosodyctl Tue Jun 25 13:20:54 2019 +0100 @@ -98,22 +98,6 @@ end end -function admin_operation(operation, arg) - local modules, tree, server, refresh = "", "", "", "" - for i, _ in ipairs(arg) do - if arg[i]:sub(1, #"--tree=") == "--tree=" then - tree = arg[i].." " - elseif arg[i]:sub(1, #"--server=") == "--server=" then - server = arg[i].." " - elseif arg[i]:sub(1, #"--no-refresh") == "--no-refresh" then - refresh = arg[i].." " - else - modules=modules..arg[i].." " - end - end - os.execute("luarocks-admin "..tree..operation..server..refresh..modules) -end - function commands.admin_add(arg) admin_operation("add ", arg) end diff -r 0780bcf51ba7 -r b59535964e81 util/prosodyctl.lua --- a/util/prosodyctl.lua Tue Jun 25 12:03:20 2019 +0100 +++ b/util/prosodyctl.lua Tue Jun 25 13:20:54 2019 +0100 @@ -278,6 +278,22 @@ return true; end +local function admin_operation(operation, arg) + local modules, tree, server, refresh = "", "", "", "" + for i, _ in ipairs(arg) do + if arg[i]:sub(1, #"--tree=") == "--tree=" then + tree = arg[i].." " + elseif arg[i]:sub(1, #"--server=") == "--server=" then + server = arg[i].." " + elseif arg[i]:sub(1, #"--no-refresh") == "--no-refresh" then + refresh = arg[i].." " + else + modules=modules..arg[i].." " + end + end + os.execute("luarocks-admin "..tree..operation..server..refresh..modules) +end + return { show_message = show_message; show_warning = show_message; @@ -297,4 +313,5 @@ start = start; stop = stop; reload = reload; + admin_operation = admin_operation; };