Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=00cad802cae67b47e2f4f365db02bae9e664464b
commit 00cad802cae67b47e2f4f365db02bae9e664464b Author: Michel Hermier <[email protected]> Date: Fri Nov 1 19:36:17 2013 +0100 makepkg: Replace '] && [' with '-a'. diff --git a/scripts/makepkg b/scripts/makepkg index 9d73793..a8bb602 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -1070,46 +1070,46 @@ fi if [ ! -z "$subpkgs" ]; then goodsubpkgs=1 - if [ "${#subdescs[@]}" != 0 ] && [ "${#subdescs[@]}" != "${#subpkgs[@]}" ]; then + if [ "${#subdescs[@]}" != 0 -a "${#subdescs[@]}" != "${#subpkgs[@]}" ]; then goodsubpkgs=0 fi - if [ "${#subdescs_localized[@]}" != 0 ] && [ "${#subdescs_localized[@]}" != "${#subpkgs[@]}" ]; then + if [ "${#subdescs_localized[@]}" != 0 -a "${#subdescs_localized[@]}" != "${#subpkgs[@]}" ]; then goodsubpkgs=0 fi - if [ "${#sublicense[@]}" != 0 ] && [ "${#sublicense[@]}" != "${#subpkgs[@]}" ]; then + if [ "${#sublicense[@]}" != 0 -a "${#sublicense[@]}" != "${#subpkgs[@]}" ]; then goodsubpkgs=0 fi - if [ "${#subreplaces[@]}" != 0 ] && [ "${#subreplaces[@]}" != "${#subpkgs[@]}" ]; then + if [ "${#subreplaces[@]}" != 0 -a "${#subreplaces[@]}" != "${#subpkgs[@]}" ]; then goodsubpkgs=0 fi - if [ "${#subgroups[@]}" != 0 ] && [ "${#subgroups[@]}" != "${#subpkgs[@]}" ]; then + if [ "${#subgroups[@]}" != 0 -a "${#subgroups[@]}" != "${#subpkgs[@]}" ]; then goodsubpkgs=0 fi - if [ "${#subdepends[@]}" != 0 ] && [ "${#subdepends[@]}" != "${#subpkgs[@]}" ]; then + if [ "${#subdepends[@]}" != 0 -a "${#subdepends[@]}" != "${#subpkgs[@]}" ]; then goodsubpkgs=0 fi - if [ "${#subrodepends[@]}" != 0 ] && [ "${#subrodepends[@]}" != "${#subpkgs[@]}" ]; then + if [ "${#subrodepends[@]}" != 0 -a "${#subrodepends[@]}" != "${#subpkgs[@]}" ]; then goodsubpkgs=0 fi - if [ "${#subremoves[@]}" != 0 ] && [ "${#subremoves[@]}" != "${#subpkgs[@]}" ]; then + if [ "${#subremoves[@]}" != 0 -a "${#subremoves[@]}" != "${#subpkgs[@]}" ]; then goodsubpkgs=0 fi - if [ "${#subconflicts[@]}" != 0 ] && [ "${#subconflicts[@]}" != "${#subpkgs[@]}" ]; then + if [ "${#subconflicts[@]}" != 0 -a "${#subconflicts[@]}" != "${#subpkgs[@]}" ]; then goodsubpkgs=0 fi - if [ "${#subprovides[@]}" != 0 ] && [ "${#subprovides[@]}" != "${#subpkgs[@]}" ]; then + if [ "${#subprovides[@]}" != 0 -a "${#subprovides[@]}" != "${#subpkgs[@]}" ]; then goodsubpkgs=0 fi - if [ "${#subbackup[@]}" != 0 ] && [ "${#subbackup[@]}" != "${#subpkgs[@]}" ]; then + if [ "${#subbackup[@]}" != 0 -a "${#subbackup[@]}" != "${#subpkgs[@]}" ]; then goodsubpkgs=0 fi - if [ "${#subinstall[@]}" != 0 ] && [ "${#subinstall[@]}" != "${#subpkgs[@]}" ]; then + if [ "${#subinstall[@]}" != 0 -a "${#subinstall[@]}" != "${#subpkgs[@]}" ]; then goodsubpkgs=0 fi - if [ "${#suboptions[@]}" != 0 ] && [ "${#suboptions[@]}" != "${#subpkgs[@]}" ]; then + if [ "${#suboptions[@]}" != 0 -a "${#suboptions[@]}" != "${#subpkgs[@]}" ]; then goodsubpkgs=0 fi - if [ "${#subarchs[@]}" != 0 ] && [ "${#subarchs[@]}" != "${#subpkgs[@]}" ]; then + if [ "${#subarchs[@]}" != 0 -a "${#subarchs[@]}" != "${#subpkgs[@]}" ]; then goodsubpkgs=0 fi if [ $goodsubpkgs -ne 1 ]; then @@ -1149,7 +1149,7 @@ elif [ "$F_makepkg_scm" = "darcs" ]; then elif [ "$F_makepkg_scm" = "svn" ]; then svn info $BUILDSCRIPT &>/dev/null && indir=y fi -if [ "$indir" = "y" ] && [ "$GENSHA1" = "0" -a "$NOBUILD" = "0" ]; then +if [ "$indir" = "y" -a "$GENSHA1" = "0" -a "$NOBUILD" = "0" ]; then if [ ! -e Changelog ] || [ `stat -c %Y Changelog|sed 's/\..*//'` -lt `stat -c %Y $BUILDSCRIPT|sed 's/\..*//'` ]; then msg "Generating the Changelog..." if [ "$F_makepkg_scm" = "git" ]; then @@ -1439,7 +1439,7 @@ fi # estimate build time if grep -i -q "^# Compiling Time: [~0-9\.]\+ SBU$" $BUILDSCRIPT && \ - [ ! -z "$SBU" ] && [ "$SBU" != "1" ]; then + [ ! -z "$SBU" -a "$SBU" != "1" ]; then pkgsbu=`grep -i "^# Compiling time: [~0-9\.]\+ SBU$" $BUILDSCRIPT|sed 's/^# Compiling [Tt]ime: ~*\([0-9\.]\+\) SBU$/\1/'` if [ ! "`type -p bc`" ]; then warning "Cannot find the bc binary! Is bc installed? Skipping calculating the estimated build time." _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
