summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjak1 <jak1@themanaworld.org>2024-02-16 14:50:14 -0300
committerFedja Beader <fedja@protonmail.ch>2025-02-26 21:30:46 +0100
commitcfbf2d1618f273e766f576f33099d4ecb1e27610 (patch)
treef445e5df2bf6c1f0667e1b5a9511bf03cf7ec046
parent190851b99b7ac3548f8db3637ddf5a64ba298051 (diff)
downloadplus-cfbf2d1618f273e766f576f33099d4ecb1e27610.tar.gz
plus-cfbf2d1618f273e766f576f33099d4ecb1e27610.tar.bz2
plus-cfbf2d1618f273e766f576f33099d4ecb1e27610.tar.xz
plus-cfbf2d1618f273e766f576f33099d4ecb1e27610.zip
Rename log file manaplus.log -> manaverse.log
(Fedja) I'm suspecting that some CI will break on this. Split off from !45: Rename the program from ManaPlus to ManaVerse. **** mana/plus!135 Co-authored-by: Fedja Beader <fedja@protonmail.ch>
-rw-r--r--src/progs/dyecmd/client.cpp2
-rw-r--r--src/progs/manaplus/client.cpp2
-rw-r--r--src/render/mobileopengl2graphics.cpp2
-rw-r--r--src/render/modernopenglgraphics.cpp2
-rwxr-xr-xtools/ci/scripts/runtest.sh8
-rwxr-xr-xtools/ci/scripts/runtests.sh8
6 files changed, 12 insertions, 12 deletions
diff --git a/src/progs/dyecmd/client.cpp b/src/progs/dyecmd/client.cpp
index e34f9b52a..9460d1465 100644
--- a/src/progs/dyecmd/client.cpp
+++ b/src/progs/dyecmd/client.cpp
@@ -192,7 +192,7 @@ void Client::gameInit()
else
{
settings.logFileName = pathJoin(settings.localDataDir,
- "manaplus.log");
+ "manaverse.log");
}
logger->setLogFile(settings.logFileName);
diff --git a/src/progs/manaplus/client.cpp b/src/progs/manaplus/client.cpp
index d0149d8b3..ff9c32564 100644
--- a/src/progs/manaplus/client.cpp
+++ b/src/progs/manaplus/client.cpp
@@ -312,7 +312,7 @@ void Client::gameInit()
else
{
settings.logFileName = pathJoin(settings.localDataDir,
- "manaplus.log");
+ "manaverse.log");
}
logger->log("Log file: " + settings.logFileName);
logger->setLogFile(settings.logFileName);
diff --git a/src/render/mobileopengl2graphics.cpp b/src/render/mobileopengl2graphics.cpp
index 4ee1093df..ef2a248af 100644
--- a/src/render/mobileopengl2graphics.cpp
+++ b/src/render/mobileopengl2graphics.cpp
@@ -170,7 +170,7 @@ void MobileOpenGL2Graphics::postInit() restrict2
if (mProgram == nullptr)
{
graphicsManager.logError();
- logger->safeError("Shader creation error. See manaplus.log.");
+ logger->safeError("Shader creation error. See manaverse.log.");
}
mProgramId = mProgram->getProgramId();
if (mProgramId == 0U)
diff --git a/src/render/modernopenglgraphics.cpp b/src/render/modernopenglgraphics.cpp
index ded53e2da..afc424f6e 100644
--- a/src/render/modernopenglgraphics.cpp
+++ b/src/render/modernopenglgraphics.cpp
@@ -175,7 +175,7 @@ void ModernOpenGLGraphics::postInit() restrict2
if (mProgram == nullptr)
{
graphicsManager.logError();
- logger->safeError("Shader creation error. See manaplus.log.");
+ logger->safeError("Shader creation error. See manaverse.log.");
}
mProgramId = mProgram->getProgramId();
if (mProgramId == 0U)
diff --git a/tools/ci/scripts/runtest.sh b/tools/ci/scripts/runtest.sh
index e629fc514..622e04da0 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/mana/manaplus.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/mana/manaplus.log" && return
- grep "Servers list updated" "${HOME}/.local/share/mana/manaplus.log" && return
- grep "Error: servers list updating error" "${HOME}/.local/share/mana/manaplus.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 1263521f9..1afe5815f 100755
--- a/tools/ci/scripts/runtests.sh
+++ b/tools/ci/scripts/runtests.sh
@@ -26,8 +26,8 @@ while true; do
rm "/root/.config/mana/mana/config.xml"
rm "${HOME}/.config/mana/mana/serverlistplus.xml"
rm "/root/.config/mana/mana/serverlistplus.xml"
- rm "${HOME}/.local/share/mana/manaplus.log"
- rm "/root/.local/share/mana/manaplus.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/mana/manaplus.log"
- rm "/root/.local/share/mana/manaplus.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