diff options
author | Lukas Fleischer <archlinux@cryptocrack.de> | 2011-08-24 10:18:25 +0200 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2011-08-25 11:20:08 +0200 |
commit | 3c175e98bdd905897199a9ff6a46de828d9a2fc1 (patch) | |
tree | b0d78eb89a56183277c8b49405887cf283b8cc0b | |
parent | ddb08cb9a1f8765ab6348374a214f682b7c6eb2d (diff) | |
download | devtools32-3c175e98bdd905897199a9ff6a46de828d9a2fc1.tar.xz |
checkpkg: Avoid unnecessary use of sed(1) and cut(1)
We already use `pacman -Sddp` here which should always only return a
single package URL for regular packages. No need to extract the first
field of the last line. Also, specify "--print-format '%l'" explicitly
to make this consistent even if pacman(8)'s default value changes some
day.
Use bash parameter expansion instead of sed(1) to extract the file name
from the URL.
Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
-rwxr-xr-x | checkpkg | 10 |
1 files changed, 2 insertions, 8 deletions
@@ -13,10 +13,6 @@ if [[ -r ~/.makepkg.conf ]]; then source ~/.makepkg.conf fi -strip_url() { - echo "$1" | sed 's|^.*://.*/||g' -} - if [[ ! -f PKGBUILD ]]; then echo 'This must be run in the directory of a built package.' exit 1 @@ -47,16 +43,14 @@ for _pkgname in "${pkgname[@]}"; do exit 1 fi - tmp=$(pacman -Spdd --noconfirm "$_pkgname") + pkgurl=$(pacman -Spdd --print-format '%l' --noconfirm "$_pkgname") if [[ $? -ne 0 ]]; then echo "Couldn't download previous package for $_pkgname." exit 1 fi - pkgurl=$(echo $tmp | rev | cut -d ' ' -f 1 | rev) - - oldpkg=$(strip_url "$pkgurl") + oldpkg=${pkgurl##*://*/} if [[ "$(basename $oldpkg)" = "$(basename $pkgfile)" ]]; then echo "The built package ($_pkgname) is the one in the repo right now!" |