diff options
| author | Dan McGee <dan@archlinux.org> | 2008-02-07 19:43:52 -0600 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-02-07 20:09:59 -0600 |
| commit | 14ee1be1ef21e09a84f01dc9623e8513218709d4 (patch) | |
| tree | 99f3228a38461375f202ddc04e93f1e6f0e0c670 /scripts | |
| parent | 11fe18479eeb7bb97062a2922da13ba816597007 (diff) | |
makepkg: do a quick check for the VCS binaries
Fixes FS#9230. Ensure we have the VCS binaries available when doing the
development version number checking.
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/makepkg.sh.in | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 68ad5978..cecda1d2 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -998,23 +998,30 @@ devel_check() { # This will only be used on the first call to makepkg; subsequent # calls to makepkg via fakeroot will explicitly pass the version # number to avoid having to determine the version number twice. + # Also do a brief check to make sure we have the VCS tool available. oldpkgver=$pkgver if [ ! -z ${_darcstrunk} ] && [ ! -z ${_darcsmod} ] ; then + [ $(type -p darcs) ] || return 0 msg "$(gettext "Determining latest darcs revision...")" newpkgver=$(date +%Y%m%d) elif [ ! -z ${_cvsroot} ] && [ ! -z ${_cvsmod} ] ; then + [ $(type -p cvs) ] || return 0 msg "$(gettext "Determining latest cvs revision...")" newpkgver=$(date +%Y%m%d) elif [ ! -z ${_gitroot} ] && [ ! -z ${_gitname} ] ; then + [ $(type -p git) ] || return 0 msg "$(gettext "Determining latest git revision...")" newpkgver=$(date +%Y%m%d) elif [ ! -z ${_svntrunk} ] && [ ! -z ${_svnmod} ] ; then + [ $(type -p svn) ] || return 0 msg "$(gettext "Determining latest svn revision...")" newpkgver=$(svn log $_svntrunk --limit 1 -q | sed -n 's/^r\([0-9]*\) .*$/\1/p') elif [ ! -z ${_bzrtrunk} ] && [ ! -z ${_bzrmod} ] ; then + [ $(type -p bzr) ] || return 0 msg "$(gettext "Determining latest bzr revision...")" newpkgver=$(bzr revno ${_bzrtrunk}) elif [ ! -z ${_hgroot} ] && [ ! -z ${_hgrepo} ] ; then + [ $(type -p hg) ] || return 0 msg "$(gettext "Determining latest hg revision...")" if [ -d ./src/$_hgrepo ] ; then cd ./src/$_hgrepo |