diff options
| author | Andriy Gapon <avg@FreeBSD.org> | 2012-02-12 14:54:19 +0000 |
|---|---|---|
| committer | Andriy Gapon <avg@FreeBSD.org> | 2012-02-12 14:54:19 +0000 |
| commit | 0782493b4c5da8433f6335d317b5888062aa2434 (patch) | |
| tree | e7de54ad840436134f379554c5c11b104a5c101d | |
| parent | 18568efd193cf939f88b354c93377097ef35de12 (diff) | |
| download | src-0782493b4c5da8433f6335d317b5888062aa2434.tar.gz src-0782493b4c5da8433f6335d317b5888062aa2434.zip | |
newvers.sh: unbreak git/git-svn support
MFC after: 2 weeks
Notes
Notes:
svn path=/head/; revision=231558
| -rw-r--r-- | sys/conf/newvers.sh | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 44d74fe3749c..cd523cab6441 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -92,11 +92,15 @@ for dir in /bin /usr/bin /usr/local/bin; do svnversion=${dir}/svnversion break fi - if [ -d "${SYSDIR}/../.git" -a -x "${dir}/git" ] ; then - git_cmd="${dir}/git --git-dir=${SYSDIR}/../.git" - break - fi done +if [ -d "${SYSDIR}/../.git" ] ; then + for dir in /bin /usr/bin /usr/local/bin; do + if [ -x "${dir}/git" ] ; then + git_cmd="${dir}/git --git-dir=${SYSDIR}/../.git" + break + fi + done +fi if [ -n "$svnversion" ] ; then svn=`cd ${SYSDIR} && $svnversion` |