From d6e299f9dc42aded07ed1871f4cbcddde5036b3e Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Tue, 12 Feb 2019 09:18:02 +0100 Subject: bumpPython, bumpPerl: use bumpPkgrel --- bumpPerl | 5 +---- bumpPython | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/bumpPerl b/bumpPerl index f16cdff1..7fe82a12 100755 --- a/bumpPerl +++ b/bumpPerl @@ -15,10 +15,7 @@ perlMinor="${perlMinor%%.*}" for pkgbuild in perl-*/PKGBUILD demeter/PKGBUILD; do - pkgrel="$( - sed -n "/^pkgrel='\?[0-9]\+'\?\$/{s@^pkgrel='\?\([0-9]\+\)'\?\$@\1@;p}" "${pkgbuild}" - )" - sed -i "s@^\(pkgrel=\)'\?[0-9]\+'\?\$@\1'$[${pkgrel}+1]'@" "${pkgbuild}" + ./bumpPkgrel -n "${pkgbuild%/PKGBUILD}" sed -i ' /^depends=(/{ :a diff --git a/bumpPython b/bumpPython index 60c4cde6..ddb40d7d 100755 --- a/bumpPython +++ b/bumpPython @@ -48,11 +48,8 @@ pyverupper="${pymajor}.$((${pyver#*.}+1))" for pkgbuild in "${pkgbuilds[@]}"; do - eval "$( - grep '^pkgrel=' "${pkgbuild}" - )" + ./bumpPkgrel -n "${pkgbuild%/PKGBUILD}" sed -i ' - s@^\(pkgrel=\)\('"'"'\?\)[0-9]\+\2$@\1'"'$((pkgrel+1))'"'@ s@'"'python>=${pymajor}\.[0-9]\+'@'python>=${pyver}'"'@ s@'"'python<${pymajor}\.[0-9]\+'@'python<${pyverupper}'"'@ ' "${pkgbuild}" -- cgit v1.2.3-70-g09d2