fix packman cd/net quirks

This commit is contained in:
Ben Gras 2007-04-13 17:13:53 +00:00
parent dc67b37a10
commit b015dae3e7

View File

@ -112,10 +112,10 @@ do cd $TMPDIR
echo "Package list:" echo "Package list:"
( echo "No.|Package|Description" ( echo "No.|Package|Description"
( (
if [ -f "$netpackages" ] if [ -f "$netpackages" -a "$source" = net ]
then cat $netpackages then cat $netpackages
fi fi
if [ -f "$cdpackages" ] if [ -f "$cdpackages" -a "$source" = cdrom ]
then cat $cdpackages then cat $cdpackages
fi fi
) | sort -f -t'|' +0 | awk '{ n++; printf "%d|%s\n", n, $0 }' ) | 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. packit $CDPACK/$file && echo Installed ok.
else echo "$CDPACK/$file not found." else echo "$CDPACK/$file not found."
fi fi
srcfile=$CDSRC/${packagename}-src.tar.bz2 srcfile=$CDSRC/${packagename}.tar.bz2
if [ -f $srcfile -a $getsources = y ] if [ -f $srcfile -a "$getsources" = y ]
then then
( cd $SRC || exit ( cd $SRC || exit
$BUNZIP2 -dc $srcfile | tar xf - || exit $BUNZIP2 -dc $srcfile | tar xf - || exit