diff options
author | Lukas Rytz <lukas.rytz@epfl.ch> | 2011-03-30 07:06:08 +0000 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@epfl.ch> | 2011-03-30 07:06:08 +0000 |
commit | bbd5efa596170e79613c7b2305171a8108e52080 (patch) | |
tree | b42d71ba5313995f0fc9fa35a478044c3aa53265 /tools | |
parent | 5691a3900dd81cfaaa25e618828d854bed277039 (diff) | |
download | scala-bbd5efa596170e79613c7b2305171a8108e52080.tar.gz scala-bbd5efa596170e79613c7b2305171a8108e52080.tar.bz2 scala-bbd5efa596170e79613c7b2305171a8108e52080.zip |
fix get-scala-revision script for the case when...
fix get-scala-revision script for the case when svn prints some
warnings. no review
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/get-git-svn-rev | 29 | ||||
-rwxr-xr-x | tools/get-scala-revision | 3 |
2 files changed, 2 insertions, 30 deletions
diff --git a/tools/get-git-svn-rev b/tools/get-git-svn-rev deleted file mode 100755 index 685ce67a6d..0000000000 --- a/tools/get-git-svn-rev +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# Usage: get-scala-rev [dir] -# Figures out current scala revision of an svn checkout or -# a git-svn mirror (or a git clone.) -# -# If no dir is given, current working dir is used. - -DIR="" -if [ $# -eq 0 ]; then - DIR=`pwd` -else - DIR=$1 -fi - -cd $DIR - -if [ -d .svn ]; then - svn info . | grep ^Revision | sed 's/Revision: //' -elif [ -d .git ]; then - GIT_PAGER=cat - # this grabs more than one line because otherwise if you have local - # commits which aren't in git-svn it won't see any revision. - git log -10 | grep git-svn-id | head -1 | sed 's/[^@]*@\([0-9]*\).*/\1/' -else - echo "${DIR} doesn't appear to be git or svn dir." >&2 - echo 0 - exit 1 -fi diff --git a/tools/get-scala-revision b/tools/get-scala-revision index 685ce67a6d..4d6e67f79e 100755 --- a/tools/get-scala-revision +++ b/tools/get-scala-revision @@ -16,7 +16,8 @@ fi cd $DIR if [ -d .svn ]; then - svn info . | grep ^Revision | sed 's/Revision: //' + # 2>&1 to catch also error output (e.g. svn warnings) + svn info . 2>&1 | grep ^Revision | sed 's/Revision: //' elif [ -d .git ]; then GIT_PAGER=cat # this grabs more than one line because otherwise if you have local |