summaryrefslogtreecommitdiffstats
path: root/scripts/makepkg.sh.in
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2009-01-02 05:34:52 +0100
committerDan McGee <dan@archlinux.org>2009-01-03 05:46:47 +0100
commitf4651c49af94164f2c129ea6eb3d78b86be4d5bc (patch)
tree17c344700d7dd1c0cad3444ef2129f5989fc678a /scripts/makepkg.sh.in
parent751d37e749fcb0a06bb21dee4b5b6d0b062ed284 (diff)
downloadpacman-f4651c49af94164f2c129ea6eb3d78b86be4d5bc.tar.gz
pacman-f4651c49af94164f2c129ea6eb3d78b86be4d5bc.tar.xz
makepkg: tidy version package tests
The use if "! -z" to check if a string is not null is not good practice so replace with the "-n" option. Also use the AND comparison within one test rather than on two separate tests. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'scripts/makepkg.sh.in')
-rw-r--r--scripts/makepkg.sh.in12
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 06595094..b18665c5 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1034,27 +1034,27 @@ devel_check() {
# 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
+ if [ -n "${_darcstrunk}" -a -n "${_darcsmod}" ] ; then
[ $(type -p darcs) ] || return 0
msg "$(gettext "Determining latest darcs revision...")"
newpkgver=$(date +%Y%m%d)
- elif [ ! -z ${_cvsroot} ] && [ ! -z ${_cvsmod} ] ; then
+ elif [ -n "${_cvsroot}" -a -n "${_cvsmod}" ] ; then
[ $(type -p cvs) ] || return 0
msg "$(gettext "Determining latest cvs revision...")"
newpkgver=$(date +%Y%m%d)
- elif [ ! -z ${_gitroot} ] && [ ! -z ${_gitname} ] ; then
+ elif [ -n "${_gitroot}" -a -n "${_gitname}" ] ; then
[ $(type -p git) ] || return 0
msg "$(gettext "Determining latest git revision...")"
newpkgver=$(date +%Y%m%d)
- elif [ ! -z ${_svntrunk} ] && [ ! -z ${_svnmod} ] ; then
+ elif [ -n "${_svntrunk}" -a -n "${_svnmod}" ] ; then
[ $(type -p svn) ] || return 0
msg "$(gettext "Determining latest svn revision...")"
newpkgver=$(LC_ALL=C svn info $_svntrunk | sed -n 's/^Last Changed Rev: \([0-9]*\)$/\1/p')
- elif [ ! -z ${_bzrtrunk} ] && [ ! -z ${_bzrmod} ] ; then
+ elif [ -n "${_bzrtrunk}" -a -n "${_bzrmod}" ] ; then
[ $(type -p bzr) ] || return 0
msg "$(gettext "Determining latest bzr revision...")"
newpkgver=$(bzr revno ${_bzrtrunk})
- elif [ ! -z ${_hgroot} ] && [ ! -z ${_hgrepo} ] ; then
+ elif [ -n "${_hgroot}" -a -n "${_hgrepo}" ] ; then
[ $(type -p hg) ] || return 0
msg "$(gettext "Determining latest hg revision...")"
if [ -d ./src/$_hgrepo ] ; then