0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

--user-data-dir: Deprecate use of relative paths

Browse source 
They're interpreted relative to $HOME. In 1.16 we'll make that
deprecated. In 1.17 we'll interpret them relative to cwd, like the
rest of the world.

Issue #2000
This commit is contained in:
josteph 2019-10-11 03:37:06 +00:00 • committed by jostephd
parent 1098c3dc81
commit 8e1024100d
1 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/filesystem.cpp
View file

@ -21,6 +21,7 @@
#include "filesystem.hpp"
#include "config.hpp"
#include "deprecation.hpp"
#include "game_config.hpp"
#include "gettext.hpp"
#include "log.hpp"
@ -620,6 +621,17 @@ void set_user_data_dir(std::string newprefdir)
} else {
if(newprefdir.empty()) {
newprefdir = "Wesnoth" + get_version_path_suffix();
} else {
#ifdef PREFERENCES_DIR
if (newprefdir != PREFERENCES_DIR)
#endif
{
// TRANSLATORS: translate the part inside <...> only
deprecated_message(_("--userdata-dir=<relative path that doesn't start with a period>"),
DEP_LEVEL::FOR_REMOVAL,
{1, 17, 0},
_("Use an absolute path, or a relative path that starts with a period and a backslash"));
}
}
PWSTR docs_path = nullptr;
@ -681,6 +693,11 @@ void set_user_data_dir(std::string newprefdir)
if(newprefdir[0] == '/') {
user_data_dir = newprefdir;
} else {
// TRANSLATORS: translate the part inside <...> only
deprecated_message(_("--userdata-dir=<relative path>"),
DEP_LEVEL::FOR_REMOVAL,
{1, 17, 0},
_("Use absolute paths. Relative paths are deprecated because they are interpreted relative to $HOME"));
user_data_dir = home / newprefdir;
}
}
@ -695,6 +712,11 @@ void set_user_data_dir(std::string newprefdir)
if(newprefdir[0] == '/') {
user_data_dir = newprefdir;
} else {
// TRANSLATORS: translate the part inside <...> only
deprecated_message(_("--userdata-dir=<relative path>"),
DEP_LEVEL::FOR_REMOVAL,
{1, 17, 0},
_("Use absolute paths. Relative paths are deprecated because they are interpreted relative to $HOME"));
user_data_dir = home / newprefdir;
}
#endif