diff options
| author | skidd13 <skidd13@openttd.org> | 2008-10-06 17:05:44 +0000 |
|---|---|---|
| committer | skidd13 <skidd13@openttd.org> | 2008-10-06 17:05:44 +0000 |
| commit | 5b8af7db3b550ccae9088fd80f0303d67e36a7a9 (patch) | |
| tree | 07f0edd93d1e253f3b809e0e55342acd3f0d9d7b /findversion.sh | |
| parent | 13587560713762f461589f5e91e66cd0aaf8d364 (diff) | |
| download | openttd-5b8af7db3b550ccae9088fd80f0303d67e36a7a9.tar.xz | |
(svn r14443) -Change: Unify the delimiters used in config* and make*
Diffstat (limited to 'findversion.sh')
| -rwxr-xr-x | findversion.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/findversion.sh b/findversion.sh index 184d5121d..e305d58cc 100755 --- a/findversion.sh +++ b/findversion.sh @@ -84,8 +84,8 @@ elif [ -d "$ROOT_DIR/.git" ]; then fi HASH=`LC_ALL=C git rev-parse --verify HEAD 2>/dev/null | cut -c1-8` REV="g$HASH" - BRANCH=`git branch|grep '[*]' | sed 's/\* //;s/^master$//'` - REV_NR=`LC_ALL=C git log --pretty=format:%s "$SRC_DIR" | grep "^(svn r[0-9]*)" | head -n 1 | sed "s/.*(svn r\([0-9]*\)).*/\1/"` + BRANCH=`git branch|grep '[*]' | sed 's#\* ##;s#^master$##'` + REV_NR=`LC_ALL=C git log --pretty=format:%s "$SRC_DIR" | grep "^(svn r[0-9]*)" | head -n 1 | sed "s#.*(svn r\([0-9]*\)).*#\1#"` elif [ -d "$ROOT_DIR/.hg" ]; then # We are a hg checkout if [ -n "`hg status \"$SRC_DIR\" | grep -v '^?'`" ]; then @@ -93,8 +93,8 @@ elif [ -d "$ROOT_DIR/.hg" ]; then fi HASH=`LC_ALL=C hg parents 2>/dev/null | head -n 1 | cut -d: -f3 | cut -c1-8` REV="h$HASH" - BRANCH=`hg branch | sed 's/^default$//'` - REV_NR=`LC_ALL=C hg log -r $HASH:0 -k "svn" -l 1 --template "{desc}\n" "$SRC_DIR" | grep "^(svn r[0-9]*)" | head -n 1 | sed "s/.*(svn r\([0-9]*\)).*/\1/"` + BRANCH=`hg branch | sed 's#^default$##'` + REV_NR=`LC_ALL=C hg log -r $HASH:0 -k "svn" -l 1 --template "{desc}\n" "$SRC_DIR" | grep "^(svn r[0-9]*)" | head -n 1 | sed "s#.*(svn r\([0-9]*\)).*#\1#"` else # We don't know MODIFIED="1" |