[arch-projects] [devtools] [PATCH 3/5] checkpkg: Avoid unnecessary use of grep(1)/basename(1)

Lukas Fleischer archlinux at cryptocrack.de
Wed Aug 24 04:18:26 EDT 2011


Use parameter expansion instead of invoking external binaries here.

Signed-off-by: Lukas Fleischer <archlinux at cryptocrack.de>
---
 checkpkg |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/checkpkg b/checkpkg
index 9d379b7..f408267 100755
--- a/checkpkg
+++ b/checkpkg
@@ -52,14 +52,14 @@ for _pkgname in "${pkgname[@]}"; do
 
 	oldpkg=${pkgurl##*://*/}
 
-	if [[ "$(basename $oldpkg)" = "$(basename $pkgfile)" ]]; then
+	if [[ ${oldpkg##*/} = ${pkgfile##*/} ]]; then
 		echo "The built package ($_pkgname) is the one in the repo right now!"
 		exit 1
 	fi
 
 	if [[ ! -f $oldpkg ]]; then
-		if echo $pkgurl | grep '^file:///' > /dev/null 2>&1; then
-			ln -s "${pkgurl#file://}" $(basename "${pkgurl#file://}")
+		if [[ $pkgurl = file://* ]]; then
+			ln -s "${pkgurl#file://}" "${pkgurl##file://*/}"
 		elif [[ -f "$PKGDEST/$oldpkg" ]]; then
 			ln -s "$PKGDEST/$oldpkg" "$oldpkg"
 		elif [[ -f "$STARTDIR/$oldpkg" ]]; then
-- 
1.7.6



More information about the arch-projects mailing list