diff options
| author | Jesusaves <cpntb1@ymail.com> | 2024-02-23 20:22:11 -0300 |
|---|---|---|
| committer | Fedja Beader <fedja@protonmail.ch> | 2025-03-01 00:53:10 +0100 |
| commit | edd31b6d6f10fc34eae88079ee519e54afda543b (patch) | |
| tree | 49a170c4a4ea44cd67b277ab2602596f01baf2c8 | |
| parent | 5623d2ca02a0f67f7158b4d4a2473e27d730b4cf (diff) | |
| download | manaplus-tmw/renameprog.tar.gz manaplus-tmw/renameprog.tar.bz2 manaplus-tmw/renameprog.tar.xz manaplus-tmw/renameprog.zip | |
Keep using .local/share/mana so updates are not re-downloaded.tmw/renameprog
/unlabel ~Hold ~WIP
| -rw-r--r-- | src/dirs.cpp | 6 | ||||
| -rwxr-xr-x | tools/ci/scripts/runtest.sh | 8 | ||||
| -rwxr-xr-x | tools/ci/scripts/runtests.sh | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/dirs.cpp b/src/dirs.cpp index ebb86c13e..0b0e23f49 100644 --- a/src/dirs.cpp +++ b/src/dirs.cpp @@ -347,13 +347,13 @@ void Dirs::initLocalDataDir() branding.getValue("appName", "ManaVerse")); #elif defined __HAIKU__ settings.localDataDir = pathJoin(VirtFs::getUserDir(), - "config/cache/ManaVerse"); + "config/cache/Mana"); #elif defined WIN32 settings.localDataDir = getSpecialFolderLocation(CSIDL_LOCAL_APPDATA); if (settings.localDataDir.empty()) settings.localDataDir = VirtFs::getUserDir(); settings.localDataDir = pathJoin(settings.localDataDir, - "ManaVerse"); + "Mana"); #elif defined __ANDROID__ settings.localDataDir = pathJoin(getSdStoragePath(), branding.getValue("appShort", "ManaVerse"), @@ -365,7 +365,7 @@ void Dirs::initLocalDataDir() #else // __APPLE__ settings.localDataDir = pathJoin(VirtFs::getUserDir(), - ".local/share/manaverse"); + ".local/share/mana"); #endif // __APPLE__ } diff --git a/tools/ci/scripts/runtest.sh b/tools/ci/scripts/runtest.sh index 523bd4b41..b5881c6c4 100755 --- a/tools/ci/scripts/runtest.sh +++ b/tools/ci/scripts/runtest.sh @@ -18,7 +18,7 @@ function check_is_run { } function check_assert { - grep -A 20 "Assert:" "${HOME}/.local/share/manaverse/manaverse.log" + grep -A 20 "Assert:" "${HOME}/.local/share/mana/manaverse.log" if [ "$?" == 0 ]; then echo "Assert found in log" exit 1 @@ -31,9 +31,9 @@ function wait_for_servers_list { echo "wait for servers list ${n}" check_is_run # check here - grep "Skipping servers list update" "${HOME}/.local/share/manaverse/manaverse.log" && return - grep "Servers list updated" "${HOME}/.local/share/manaverse/manaverse.log" && return - grep "Error: servers list updating error" "${HOME}/.local/share/manaverse/manaverse.log" + grep "Skipping servers list update" "${HOME}/.local/share/mana/manaverse.log" && return + grep "Servers list updated" "${HOME}/.local/share/mana/manaverse.log" && return + grep "Error: servers list updating error" "${HOME}/.local/share/mana/manaverse.log" if [ "$?" == 0 ]; then echo "Servers list downloading error" exit 1 diff --git a/tools/ci/scripts/runtests.sh b/tools/ci/scripts/runtests.sh index cf781ff1b..895f62f74 100755 --- a/tools/ci/scripts/runtests.sh +++ b/tools/ci/scripts/runtests.sh @@ -26,8 +26,8 @@ while true; do rm "/root/.config/mana/manaverse/config.xml" rm "${HOME}/.config/mana/manaverse/serverlistplus.xml" rm "/root/.config/mana/manaverse/serverlistplus.xml" - rm "${HOME}/.local/share/manaverse/manaverse.log" - rm "/root/.local/share/manaverse/manaverse.log" + rm "${HOME}/.local/share/mana/manaverse.log" + rm "/root/.local/share/mana/manaverse.log" ./tools/ci/scripts/runtest.sh if [ "$?" != 0 ]; then exit 1 @@ -45,8 +45,8 @@ echo "existing config runs" n=0 while true; do echo "run test ${n}" - rm "${HOME}/.local/share/manaverse/manaverse.log" - rm "/root/.local/share/manaverse/manaverse.log" + rm "${HOME}/.local/share/mana/manaverse.log" + rm "/root/.local/share/mana/manaverse.log" ./tools/ci/scripts/runtest.sh if [ "$?" != 0 ]; then exit 1 |