diff --git a/mk/linux/makerelease.sh b/mk/linux/makerelease.sh index 2d9526071..0ae68de99 100755 --- a/mk/linux/makerelease.sh +++ b/mk/linux/makerelease.sh @@ -1,16 +1,16 @@ #!/bin/bash -# Use this script to build MegaGlest Source Code Archive for a Version Release +# Use this script to build ZetaGlest Source Code Archive for a Version Release # (Source archive for 'make install', without embedded content) # ---------------------------------------------------------------------------- # Written by Mark Vejvoda # Copyright (c) 2011 Mark Vejvoda under GNU GPL v3.0+ VERSION=$(./mg-version.sh --version) -RELEASENAME=megaglest-source +RELEASENAME=zetaglest-binary PACKAGE="$RELEASENAME-$VERSION.tar.xz" CURRENTDIR="$(dirname $(readlink -f $0))" RELEASEDIR_ROOT="$CURRENTDIR/../../../release" -RELEASEDIR="$RELEASEDIR_ROOT/$RELEASENAME-$VERSION/megaglest-$VERSION" +RELEASEDIR="$RELEASEDIR_ROOT/$RELEASENAME-$VERSION/zetaglest-$VERSION" SOURCEDIR="$CURRENTDIR/../../source/" REPODIR="$CURRENTDIR/../../" @@ -55,7 +55,7 @@ rm -rf "$RELEASEDIR/source/shared_lib/include/platform/miniupnpc/" cd ${CURRENTDIR} echo "Creating $PACKAGE" [[ -f "$RELEASEDIR_ROOT/$PACKAGE" ]] && rm "$RELEASEDIR_ROOT/$PACKAGE" -tar cJf "$RELEASEDIR_ROOT/$PACKAGE" -C "$RELEASEDIR_ROOT/$RELEASENAME-$VERSION" "megaglest-$VERSION" +tar cJf "$RELEASEDIR_ROOT/$PACKAGE" -C "$RELEASEDIR_ROOT/$RELEASENAME-$VERSION" "zetaglest-$VERSION" +tar cJf "$RELEASEDIR_ROOT/$PACKAGE" -C "$RELEASEDIR_ROOT/$RELEASENAME-$VERSION" "zetaglest-$VERSION" ls -la $RELEASEDIR_ROOT/$PACKAGE - diff --git a/mk/linux/start_zetaglest_gameserver b/mk/linux/start_zetaglest_gameserver index 8a1bb0174..6df0f0891 100755 --- a/mk/linux/start_zetaglest_gameserver +++ b/mk/linux/start_zetaglest_gameserver @@ -21,10 +21,8 @@ # user connecting to a headless server controls it. If this user disconnects, # the next user who connects (or had already connected) takes control. # -# Please read https://docs.megaglest.org/MG/Dedicated_Server for more information -# # ---------------------------------------------------------------------------- -# 2013 Written by Tom Reynolds +# 2013 Written by Tom Reynolds # 2015 Rewritten by filux # Copyright (c) 2013-2017 under GNU GPL v3.0+ # ---------------------------------------------------------------------------- diff --git a/mk/linux/tools-for-standalone-client/megaglest-configure-desktop.sh b/mk/linux/tools-for-standalone-client/megaglest-configure-desktop.sh deleted file mode 100755 index 5f833744e..000000000 --- a/mk/linux/tools-for-standalone-client/megaglest-configure-desktop.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# Use this script to improve configuration of '.desktop' files. -# ---------------------------------------------------------------------------- -# 2014 Written by filux -# Copyright (c) 2014-2016 under GNU GPL v3.0+ -LANG=C - -CURRENTDIR="$(dirname "$(readlink -f "$0")")" -cd "$CURRENTDIR"; prmtr="Icon="; prmtr2="Exec=" -if [ -f "megaglest.desktop" ] && [ -f "megaglest.png" ] && [ -f "megaglest" ] \ - && [ -f "start_megaglest" ] && [ ! -f "glest-dev.ini" ]; then - desktop_location="$CURRENTDIR/megaglest.desktop"; icon_location="$CURRENTDIR/megaglest.png" - exec_location="$CURRENTDIR/start_megaglest" - sed -i -e "s#$prmtr.*#$prmtr$icon_location#" -e "s#$prmtr2.*#$prmtr2\"$exec_location\"#" \ - "$desktop_location" - chmod +x "$desktop_location" -fi -if [ -f "megaglest_editor.desktop" ] && [ -f "megaglest.png" ] && [ -f "megaglest_editor" ] \ - && [ -f "start_megaglest_mapeditor" ] && [ ! -f "glest-dev.ini" ]; then - desktop_location="$CURRENTDIR/megaglest_editor.desktop" - icon_location="$CURRENTDIR/megaglest.png"; exec_location="$CURRENTDIR/start_megaglest_mapeditor" - sed -i -e "s#$prmtr.*#$prmtr$icon_location#" -e "s#$prmtr2.*#$prmtr2\"$exec_location\"#" \ - "$desktop_location" - chmod +x "$desktop_location" -fi -if [ -f "megaglest_g3dviewer.desktop" ] && [ -f "megaglest.png" ] && [ -f "megaglest_g3dviewer" ] \ - && [ -f "start_megaglest_g3dviewer" ] && [ ! -f "glest-dev.ini" ]; then - desktop_location="$CURRENTDIR/megaglest_g3dviewer.desktop" - icon_location="$CURRENTDIR/megaglest.png"; exec_location="$CURRENTDIR/start_megaglest_g3dviewer" - sed -i -e "s#$prmtr.*#$prmtr$icon_location#" -e "s#$prmtr2.*#$prmtr2\"$exec_location\"#" \ - "$desktop_location" - chmod +x "$desktop_location" -fi diff --git a/mk/linux/tools-for-standalone-client/start_megaglest b/mk/linux/tools-for-standalone-client/start_zetaglest similarity index 98% rename from mk/linux/tools-for-standalone-client/start_megaglest rename to mk/linux/tools-for-standalone-client/start_zetaglest index 0f9c348cc..2f5bf5cd5 100755 --- a/mk/linux/tools-for-standalone-client/start_megaglest +++ b/mk/linux/tools-for-standalone-client/start_zetaglest @@ -9,20 +9,20 @@ LANG=C SCRIPTLOCATION="$(readlink -f "$0")" GAMEDIR="$(dirname "$SCRIPTLOCATION")" ARCHITECTURE="$(uname -m | tr '[A-Z]' '[a-z]')" -BugReportEngine="https://github.com/MegaGlest/megaglest-source/issues" -BugReportBoth="https://forum.megaglest.org/index.php?board=23.0" +BugReportEngine="https://github.com/ZetaGlest/zetaglest-source/issues" +BugReportBoth="https://github.com/ZetaGlest" # ------- # useful for mods BugReportBoth2="$BugReportBoth" -BugReportData="https://github.com/MegaGlest/megaglest-data/issues" +BugReportData="https://github.com/ZetaGlest/zetaglest-data/issues" -EXC_BINARY="megaglest" -if [ -f "${GAMEDIR}/megaglest_shim" ]; then EXC_BINARY="megaglest_shim" +EXC_BINARY="zetaglest" +if [ -f "${GAMEDIR}/zetaglest_shim" ]; then EXC_BINARY="zetaglest_shim" -SHORT_GAME_NAME="megaglest" +SHORT_GAME_NAME="zetaglest" # if long game name contain spaces then write it inside quotes # e.g. "\"long name with spaces\"" -LONG_GAME_NAME="MegaGlest" +LONG_GAME_NAME="ZetaGlest" # ------- LIBDIR="lib"; ExitStatus=0; LibsWarnings=""; IgnoredLibs=""; FirstLnError="" diff --git a/mk/linux/tools-for-standalone-client/start_megaglest_g3dviewer b/mk/linux/tools-for-standalone-client/start_zetaglest_g3dviewer similarity index 91% rename from mk/linux/tools-for-standalone-client/start_megaglest_g3dviewer rename to mk/linux/tools-for-standalone-client/start_zetaglest_g3dviewer index 4845a0122..ea6dcdf69 100755 --- a/mk/linux/tools-for-standalone-client/start_megaglest_g3dviewer +++ b/mk/linux/tools-for-standalone-client/start_zetaglest_g3dviewer @@ -8,8 +8,8 @@ SCRIPTLOCATION="$(readlink -f "$0")" GAMEDIR="$(dirname "$SCRIPTLOCATION")" # ------- # useful for mods -EXC_BINARY="megaglest_g3dviewer" -BASIC_SCRIPT="start_megaglest" +EXC_BINARY="zetaglest_g3dviewer" +BASIC_SCRIPT="start_zetaglest" # ------- LIBDIR="lib" WARNINGS="$("$GAMEDIR/$BASIC_SCRIPT" --tool-g3dviewer "$EXC_BINARY" 2>&1)" diff --git a/mk/linux/tools-for-standalone-client/start_megaglest_mapeditor b/mk/linux/tools-for-standalone-client/start_zetaglest_mapeditor similarity index 91% rename from mk/linux/tools-for-standalone-client/start_megaglest_mapeditor rename to mk/linux/tools-for-standalone-client/start_zetaglest_mapeditor index 27427fe54..78070d098 100755 --- a/mk/linux/tools-for-standalone-client/start_megaglest_mapeditor +++ b/mk/linux/tools-for-standalone-client/start_zetaglest_mapeditor @@ -8,8 +8,8 @@ SCRIPTLOCATION="$(readlink -f "$0")" GAMEDIR="$(dirname "$SCRIPTLOCATION")" # ------- # useful for mods -EXC_BINARY="megaglest_editor" -BASIC_SCRIPT="start_megaglest" +EXC_BINARY="zetaglest_editor" +BASIC_SCRIPT="start_zetaglest" # ------- LIBDIR="lib" WARNINGS="$("$GAMEDIR/$BASIC_SCRIPT" --tool-editor "$EXC_BINARY" 2>&1)" diff --git a/mk/linux/tools-for-standalone-client/zetaglest-configure-desktop.sh b/mk/linux/tools-for-standalone-client/zetaglest-configure-desktop.sh new file mode 100755 index 000000000..d7110bbc7 --- /dev/null +++ b/mk/linux/tools-for-standalone-client/zetaglest-configure-desktop.sh @@ -0,0 +1,33 @@ +#!/bin/sh +# Use this script to improve configuration of '.desktop' files. +# ---------------------------------------------------------------------------- +# 2014 Written by filux +# Copyright (c) 2014-2016 under GNU GPL v3.0+ +LANG=C + +CURRENTDIR="$(dirname "$(readlink -f "$0")")" +cd "$CURRENTDIR"; prmtr="Icon="; prmtr2="Exec=" +if [ -f "zetaglest.desktop" ] && [ -f "zetaglest.png" ] && [ -f "zetaglest" ] \ + && [ -f "start_zetaglest" ] && [ ! -f "glest-dev.ini" ]; then + desktop_location="$CURRENTDIR/zetaglest.desktop"; icon_location="$CURRENTDIR/zetaglest.png" + exec_location="$CURRENTDIR/start_zetaglest" + sed -i -e "s#$prmtr.*#$prmtr$icon_location#" -e "s#$prmtr2.*#$prmtr2\"$exec_location\"#" \ + "$desktop_location" + chmod +x "$desktop_location" +fi +if [ -f "zetaglest_editor.desktop" ] && [ -f "zetaglest.png" ] && [ -f "zetaglest_editor" ] \ + && [ -f "start_zetaglest_mapeditor" ] && [ ! -f "glest-dev.ini" ]; then + desktop_location="$CURRENTDIR/zetaglest_editor.desktop" + icon_location="$CURRENTDIR/zetaglest.png"; exec_location="$CURRENTDIR/start_zetaglest_mapeditor" + sed -i -e "s#$prmtr.*#$prmtr$icon_location#" -e "s#$prmtr2.*#$prmtr2\"$exec_location\"#" \ + "$desktop_location" + chmod +x "$desktop_location" +fi +if [ -f "zetaglest_g3dviewer.desktop" ] && [ -f "zetaglest.png" ] && [ -f "zetaglest_g3dviewer" ] \ + && [ -f "start_zetaglest_g3dviewer" ] && [ ! -f "glest-dev.ini" ]; then + desktop_location="$CURRENTDIR/zetaglest_g3dviewer.desktop" + icon_location="$CURRENTDIR/zetaglest.png"; exec_location="$CURRENTDIR/start_zetaglest_g3dviewer" + sed -i -e "s#$prmtr.*#$prmtr$icon_location#" -e "s#$prmtr2.*#$prmtr2\"$exec_location\"#" \ + "$desktop_location" + chmod +x "$desktop_location" +fi