From a703f272846902f05b9ca20ca5d0afba461e8081 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Thu, 23 Jan 2020 21:59:13 +0000 Subject: prosodyctl: Fix some luacheck warnings --- prosodyctl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/prosodyctl b/prosodyctl index b16d9230..028e08d8 100755 --- a/prosodyctl +++ b/prosodyctl @@ -69,6 +69,7 @@ local modulemanager = require "core.modulemanager" local prosodyctl = require "util.prosodyctl" local socket = require "socket" local dependencies = require "util.dependencies"; +local lfs = dependencies.softreq "lfs"; ----------------------- @@ -198,14 +199,15 @@ function commands.deluser(arg) return 1; end -local function service_command_warning(command) +local function service_command_warning(service_command) if prosody.installed and configmanager.get("*", "prosodyctl_service_warnings") ~= false then show_warning("WARNING: Use of prosodyctl start/stop/restart/reload is not recommended"); show_warning(" if Prosody is managed by an init system - use that directly instead."); + lfs = lfs or require if lfs.attributes("/etc/systemd") then - show_warning(" e.g. systemctl %s prosody", command); + show_warning(" e.g. systemctl %s prosody", service_command); elseif lfs.attributes("/etc/init.d/prosody") then - show_warning(" e.g. /etc/init.d/prosody %s", command); + show_warning(" e.g. /etc/init.d/prosody %s", service_command); end show_warning(""); end @@ -512,7 +514,6 @@ function commands.unregister(arg) end local openssl; -local lfs; local cert_commands = {}; -- cgit v1.2.3