From ecf0dc01952f8e2c4013aa0964b70ac82b25ae04 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 4 Jul 2014 23:13:51 +0200 Subject: prosodyctl: Show relative paths in about --- prosodyctl | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/prosodyctl b/prosodyctl index bfb118c3..60bc0c08 100755 --- a/prosodyctl +++ b/prosodyctl @@ -528,16 +528,18 @@ function commands.about(arg) return 1; end + local pwd = "."; local array = require "util.array"; local keys = require "util.iterators".keys; + local relpath = config.resolve_relative_path; print("Prosody "..(prosody.version or "(unknown version)")); print(""); print("# Prosody directories"); - print("Data directory: ", CFG_DATADIR or "./"); - print("Plugin directory:", CFG_PLUGINDIR or "./"); - print("Config directory:", CFG_CONFIGDIR or "./"); - print("Source directory:", CFG_SOURCEDIR or "./"); + print("Data directory: "..relpath(pwd, data_path)); + print("Plugin directory: "..relpath(pwd, CFG_PLUGINDIR or ".")); + print("Config directory: "..relpath(pwd, CFG_CONFIGDIR or ".")); + print("Source directory: "..relpath(pwd, CFG_SOURCEDIR or ".")); print(""); print("# Lua environment"); print("Lua version: ", _G._VERSION); -- cgit v1.2.3