diff options
| author | George Koehler <kernigh@gmail.com> | 2019-08-28 17:45:36 -0400 |
|---|---|---|
| committer | Charles Pigott <charlespigott@googlemail.com> | 2019-08-31 20:11:24 +0100 |
| commit | c655f89d845a4d670c7b30575c5b8de799b12363 (patch) | |
| tree | 38e5a29d82e3368394b4e3bf78aeadea7171778d /config.lib | |
| parent | 14bca191631f557b555d027f352824e6ee2a54f8 (diff) | |
| download | openttd-c655f89d845a4d670c7b30575c5b8de799b12363.tar.xz | |
Fix: Allow git worktree in version detection; drop svn, hg.
If $ROOT_DIR is a linked working tree from git-worktree(1), then
$ROOT_DIR/.git is a regular file instead of a directory. Allow this
when deciding whether to use git to detect OpenTTD's version.
Drop checks for svn and hg in config.lib, because findversion.sh
hasn't used svn nor hg since 192770e6da.
Diffstat (limited to 'config.lib')
| -rw-r--r-- | config.lib | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/config.lib b/config.lib index e8f77adc7..495921fe4 100644 --- a/config.lib +++ b/config.lib @@ -1059,18 +1059,8 @@ check_params() { fi fi - if [ -d "$ROOT_DIR/.svn" ] && [ -n "`svn help 2>/dev/null`" ]; then - log 1 "checking revision... svn detection" - elif [ -d "$ROOT_DIR/../.svn" ] && [ -n "`svn help 2>/dev/null`" ] && [ -n "`LC_ALL=C svn info $ROOT_DIR/.. | grep '^URL:.*tags$'`" ]; then - # subversion changed its behaviour; now not all folders have a .svn folder, - # but only the root folder. Since making tags requires a (sparse) checkout - # of the tags folder, the folder of the tag does not have a .svn folder - # anymore and this fails to detect the subversion repository checkout. - log 1 "checking revision... svn detection (tag)" - elif [ -d "$ROOT_DIR/.git" ] && [ -n "`git help 2>/dev/null`" ]; then + if { [ -d "$ROOT_DIR/.git" ] || [ -f "$ROOT_DIR/.git" ]; } && [ -n "`git help 2>/dev/null`" ]; then log 1 "checking revision... git detection" - elif [ -d "$ROOT_DIR/.hg" ] && [ -n "`HGPLAIN= hg help 2>/dev/null`" ]; then - log 1 "checking revision... hg detection" elif [ -f "$ROOT_DIR/.ottdrev" ]; then log 1 "checking revision... source tarball" else |