[pacman-dev] [PATCH] removedeps refactoring in makepkg and bug #6215 fix

[Dan McGee]

On 1/16/07, Aaron Griffin <aaronmgriffin at gmail.com> wrote:
> On 1/16/07, Roman Kyrylych <roman.kyrylych at gmail.com> wrote:
> > I forgot to add sign off it. So here it is:
> >
> > Signed-off-by: Roman Kyrylych <Roman.Kyrylych at gmail.com>
>
> Applied! Thanks!
>

Fixed a small bug with unset, and a typo in the word "dependency". One
minor indent fix too. :)

-p0 will work better than -p1 with this one.

Signed-off-by: Dan McGee <dpmcgee at gmail.com>

Index: scripts/makepkg
===================================================================
RCS file: /home/cvs-pacman/pacman-lib/scripts/makepkg,v
retrieving revision 1.28
diff -u -r1.28 makepkg
--- scripts/makepkg	17 Jan 2007 04:54:55 -0000	1.28
+++ scripts/makepkg	17 Jan 2007 05:10:03 -0000
@@ -265,17 +265,16 @@
 		msg "Removing installed dependencies..."
 		if [ "$INFAKEROOT" = "1" ]; then
 			export FAKEROOTKEY2=$FAKEROOTKEY
-			unset $FAKEROOTKEY
+			unset FAKEROOTKEY
 		fi
 		sudo pacman3 $PACMAN_OPTS -R $makedeplist $deplist
 		if [ "$INFAKEROOT" = "1" ]; then
 			export FAKEROOTKEY=$FAKEROOTKEY2
-			unset $FAKEROOTKEY2
+			unset FAKEROOTKEY2
 		fi
 	fi
 }

-
 usage() {
 	echo "makepkg version $myver"
 	echo
@@ -516,7 +515,7 @@
 unset deplist makedeplist
 # fix flyspray bug #5973
 if [ "$NODEPS" = "1" -o "$GENINTEG" = "1" -o "$NOBUILD" = "1" -o
"$REPKG" = "1" ]; then
-	warning "skipping dependecy checks"
+	warning "skipping dependency checks"
 elif [ $(type -p pacman) ]; then
 	msg "Checking Runtime Dependencies..."
 	deplist=$(checkdeps ${depends[@]})
@@ -811,11 +810,11 @@
 	if [ "$ext" != "gz" -a "$ext" != "bz2" ]; then
 		# update symlinks to this manpage
 		find $startdir/pkg/{usr{,/local},opt/*}/man -lname "$fn" 2>
/dev/null | while read ln ; do
-		rm -f "$ln"
-		ln -sf "${fn}.gz" "${ln}.gz"
-	done
-	# compress the original
-	gzip -9 "$i"
+			rm -f "$ln"
+			ln -sf "${fn}.gz" "${ln}.gz"
+		done
+		# compress the original
+		gzip -9 "$i"
 	fi
 done