From 51575da5254db38485c613c0922fbfa2c9ff319e Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Wed, 4 Jun 2014 21:30:11 +0300 Subject: [PATCH] Reverted to upstream way of guessing version number --- version-override => .ottdrev | 0 findversion.sh | 8 +------- 2 files changed, 1 insertion(+), 7 deletions(-) rename version-override => .ottdrev (100%) diff --git a/version-override b/.ottdrev similarity index 100% rename from version-override rename to .ottdrev diff --git a/findversion.sh b/findversion.sh index 5c0da20382..d9b57aa622 100755 --- a/findversion.sh +++ b/findversion.sh @@ -67,12 +67,6 @@ fi cd `dirname "$0"` ROOT_DIR=`pwd` -# Override version number, to allow OpenTTD with Android modifications to connect to official servers -if [ -e $ROOT_DIR/version-override ]; then - cat $ROOT_DIR/version-override - exit -fi - # Determine if we are using a modified version # Assume the dir is not modified MODIFIED="0" @@ -90,7 +84,7 @@ if [ -d "$ROOT_DIR/.svn" ] || [ -d "$ROOT_DIR/../.svn" ]; then else REV="r$REV_NR" fi -elif [ -e "$ROOT_DIR/.git" ]; then +elif [ -d "$ROOT_DIR/.git" ]; then # We are a git checkout # Refresh the index to make sure file stat info is in sync, then look for modifications git update-index --refresh >/dev/null