From: Ben Gras <ben@minix3.org>
Date: Fri, 13 Apr 2007 17:13:53 +0000 (+0000)
Subject: fix packman cd/net quirks
X-Git-Tag: v3.1.3
X-Git-Url: http://zhaoyanbai.com/repos/Bv9ARM.ch10.html?a=commitdiff_plain;h=b015dae3e73af498eb2e5ae40ab768d0cc29fba2;p=minix.git

fix packman cd/net quirks
---

diff --git a/commands/scripts/packman.sh b/commands/scripts/packman.sh
index b62f2d2e0..7503918f1 100644
--- a/commands/scripts/packman.sh
+++ b/commands/scripts/packman.sh
@@ -112,10 +112,10 @@ do	cd $TMPDIR
 	echo "Package list:"
 	(	echo "No.|Package|Description"
 		(
-		if [ -f "$netpackages" ]
+		if [ -f "$netpackages" -a "$source" = net ]
 		then	cat $netpackages
 		fi
-		if [ -f "$cdpackages" ]
+		if [ -f "$cdpackages" -a "$source" = cdrom ]
 		then	cat $cdpackages
 		fi
 		) | sort -f -t'|' +0 | awk '{ n++; printf "%d|%s\n", n, $0 }' 
@@ -194,8 +194,8 @@ do	cd $TMPDIR
 				packit $CDPACK/$file && echo Installed ok.
 			else	echo "$CDPACK/$file not found."
 			fi
-			srcfile=$CDSRC/${packagename}-src.tar.bz2
-			if [ -f $srcfile -a $getsources = y ]
+			srcfile=$CDSRC/${packagename}.tar.bz2
+			if [ -f $srcfile -a "$getsources" = y ]
 			then 
 					(	cd $SRC || exit
 						$BUNZIP2 -dc $srcfile | tar xf - || exit