diff --git a/mk/linux/mg-version-synch.sh b/mk/linux/mg-version-synch.sh index 947864237..604d728a9 100755 --- a/mk/linux/mg-version-synch.sh +++ b/mk/linux/mg-version-synch.sh @@ -9,9 +9,8 @@ CURRENT_VERSION=`./mg-version.sh --version` OLD_VERSION=`./mg-version.sh --oldversion_binary` VERSION_INFO_FILE="$(dirname "$(readlink -f "$0")")/../../source/version.txt" LastCompatibleSaveGameVersion="$(awk -F '=' '/^LastCompatibleSaveGameVersion =/ {print $2}' "$VERSION_INFO_FILE" | awk -F '"' '{print $2}')" -MapeditorVersion="$(awk -F '=' '/^MapeditorVersion =/ {print $2}' "$VERSION_INFO_FILE" | awk -F '"' '{print $2}')" -G3dviewerVersion="$(awk -F '=' '/^G3dviewerVersion =/ {print $2}' "$VERSION_INFO_FILE" | awk -F '"' '{print $2}')" -#if [ "$(echo "$CURRENT_VERSION" | grep -v [a-zA-Z])" != "" ]; then modifymore="yes"; else modifymore="no"; fi +MapeditorVersion="$CURRENT_VERSION" +G3dviewerVersion="$CURRENT_VERSION" modifymore="yes" echo echo '===== Updating Game ======' diff --git a/mk/linux/mg-version.sh b/mk/linux/mg-version.sh index 4924e9ff1..ef735ca78 100755 --- a/mk/linux/mg-version.sh +++ b/mk/linux/mg-version.sh @@ -5,8 +5,8 @@ # Copyright (c) 2011 Mark Vejvoda under GNU GPL v3.0+ VERSION_INFO_FILE="$(dirname "$(readlink -f "$0")")/../../source/version.txt" -OLD_MG_VERSION="$(awk -F '=' '/^OldReleaseGameDataVersion =/ {print $2}' "$VERSION_INFO_FILE" | awk -F '"' '{print $2}')" -OLD_MG_VERSION_BINARY="$(awk -F '=' '/^OldReleaseGameBinaryVersion =/ {print $2}' "$VERSION_INFO_FILE" | awk -F '"' '{print $2}')" +OLD_MG_VERSION="$(awk -F '=' '/^OldReleaseGameVersion =/ {print $2}' "$VERSION_INFO_FILE" | awk -F '"' '{print $2}')" +OLD_MG_VERSION_BINARY="$OLD_MG_VERSION" MG_VERSION="$(awk -F '=' '/^CurrentGameVersion =/ {print $2}' "$VERSION_INFO_FILE" | awk -F '"' '{print $2}')" if [ "$1" = "--oldversion" ]; then diff --git a/source/version.txt b/source/version.txt index ab19547b6..aeb3e790a 100644 --- a/source/version.txt +++ b/source/version.txt @@ -6,12 +6,8 @@ CurrentGameVersion = "3.12-dev"; # ^ typical version numbers look like this: "3.11-beta1.0", "3.12-dev", "3.12.0" -OldReleaseGameBinaryVersion = "3.11.0"; -OldReleaseGameDataVersion = "3.11.0"; +OldReleaseGameVersion = "3.11.0"; LastCompatibleSaveGameVersion = "3.9.0"; -MapeditorVersion = "1.6.1"; -G3dviewerVersion = "1.3.6"; - GitCommitForRelease = "4446.1a8673f"; # ^ will be automatically generated