tazlito rev 78

Add EXTRAVERSION support
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed Jul 02 21:05:21 2008 +0000 (2008-07-02)
parents 1cf5f767514f
children cf1e7955349a
files tazlito
line diff
     1.1 --- a/tazlito	Sun Jun 15 13:22:47 2008 +0000
     1.2 +++ b/tazlito	Wed Jul 02 21:05:21 2008 +0000
     1.3 @@ -158,6 +158,7 @@
     1.4  	local tazpkg
     1.5  	local package
     1.6  	local VERSION
     1.7 +	local EXTRAVERSION
     1.8  	tazpkg=$1
     1.9  	# try du find package name and version to be able
    1.10  	# to repack it from installation
    1.11 @@ -167,7 +168,9 @@
    1.12  	while true; do
    1.13  		VERSION=""
    1.14  		eval $(grep -s ^VERSION= $INSTALLED/$i/receipt)
    1.15 -		if [ "$i-$VERSION" = "$tazpkg" ]; then
    1.16 +		EXTRAVERSION=""
    1.17 +		eval $(grep -s ^EXTRAVERSION= $INSTALLED/$i/receipt)
    1.18 +		if [ "$i-$VERSION$EXTRAVERSION" = "$tazpkg" ]; then
    1.19  			echo $i
    1.20  			break
    1.21  		fi
    1.22 @@ -641,12 +644,14 @@
    1.23  		\rm -f $FLAVOR.pkglist $FLAVOR.nonfree 2> /dev/null
    1.24  		for i in $(ls $ROOTFS$INSTALLED); do
    1.25  			eval $(grep ^VERSION= $ROOTFS$INSTALLED/$i/receipt)
    1.26 +			EXTRAVERSION=""
    1.27 +			eval $(grep ^EXTRAVERSION= $ROOTFS$INSTALLED/$i/receipt)
    1.28  			eval $(grep ^CATEGORY= $ROOTFS$INSTALLED/$i/receipt)
    1.29  			if [ "$CATEGORY" = "non-free" -a "${i%%-*}" != "get" ]
    1.30  			then
    1.31  				echo "$i" >> $FLAVOR.nonfree
    1.32  			else
    1.33 -				echo "$i-$VERSION" >> $FLAVOR.pkglist
    1.34 +				echo "$i-$VERSION$EXTRAVERSION" >> $FLAVOR.pkglist
    1.35  			fi
    1.36  		done
    1.37  		[ -s $FLAVOR.nonfree ] && $FILES="$FILES\n$FLAVOR.nonfree"
    1.38 @@ -722,7 +727,9 @@
    1.39  		# Build list with installed packages
    1.40  			for i in $(ls $INSTALLED); do
    1.41  				eval $(grep ^VERSION= $INSTALLED/$i/receipt)
    1.42 -				echo "$i-$VERSION" >> $LIST_NAME
    1.43 +				EXTRAVERSION=""
    1.44 +				eval $(grep ^EXTRAVERSION= $INSTALLED/$i/receipt)
    1.45 +				echo "$i-$VERSION$EXTRAVERSION" >> $LIST_NAME
    1.46  			done
    1.47  		fi
    1.48  		# Exit if no list name.