diff options
author | Kim Alvefur <zash@zash.se> | 2020-10-05 21:54:17 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2020-10-05 21:54:17 +0200 |
commit | 4b4f32104fa6bf53f1c1ad22296d7be212601891 (patch) | |
tree | 25601de4b090e8b64f85b966ea96d99fb6420c93 /util | |
parent | defba34a6c15adb6dbb2fcef71fb5b2852f1e493 (diff) | |
download | prosody-4b4f32104fa6bf53f1c1ad22296d7be212601891.tar.gz prosody-4b4f32104fa6bf53f1c1ad22296d7be212601891.zip |
util.startup: Fix startup failure if CFG_DATADIR is unset
As is normal when running from source
Diffstat (limited to 'util')
-rw-r--r-- | util/startup.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/startup.lua b/util/startup.lua index fefedcbf..b7d9f6fe 100644 --- a/util/startup.lua +++ b/util/startup.lua @@ -260,7 +260,7 @@ function startup.setup_plugindir() end function startup.setup_plugin_install_path() - local installer_plugin_path = config.get("*", "installer_plugin_path") or CFG_DATADIR.."/custom_plugins"; + local installer_plugin_path = config.get("*", "installer_plugin_path") or (CFG_DATADIR or "data").."/custom_plugins"; local path_sep = package.config:sub(3,3); -- TODO Figure out what this should be relative to, because CWD could be anywhere installer_plugin_path = config.resolve_relative_path(require "lfs".currentdir(), installer_plugin_path); |