SliTaz Repositories

     1.1 --- a/modules/pkgdb	Wed May 30 07:07:40 2018 +0100
     1.2 +++ b/modules/pkgdb	Sat Feb 02 13:36:54 2019 +0200
     1.3 @@ -119,7 +119,8 @@
     1.4  _ 'Creating lists from "%s"' "$WOK" | dblog
     1.5  cd $WOK
     1.6  rsumf=$(mktemp)
     1.7 -touch $dbs/packages.desc $dbs/packages.txt $dbs/packages.info $dbs/packages.equiv
     1.8 +#touch $dbs/packages.desc $dbs/packages.txt $dbs/packages.info $dbs/packages.equiv
     1.9 +touch $dbs/packages.info $dbs/packages.equiv
    1.10  for i in *; do
    1.11  	[ -d "$WOK/$i/taz" ] || continue
    1.12  
    1.13 @@ -127,39 +128,44 @@
    1.14  		pack="$i/taz/$j"
    1.15  		[ -f "$WOK/$pack/receipt" ] || continue
    1.16  		unset_receipt
    1.17 +		unset PACKED_SIZE UNPACKED_SIZE RSUM PACKAGE VERSION EXTRAVERSION CATEGORY SHORT_DESC MAINTAINER LICENSE WEB_SITE DEPENDS TAGS PROVIDE
    1.18  		. ./$pack/receipt
    1.19  
    1.20 -		if [ -f "$PKGS/$PACKAGE-$VERSION$EXTRAVERSION$arch.tazpkg" ]; then
    1.21 +		if [ -f "$PKGS/$PACKAGE-$VERSION$EXTRAVERSION-$ARCH.tazpkg" -o -f "$PKGS/$PACKAGE-$VERSION$EXTRAVERSION-any.tazpkg"]; then
    1.22  
    1.23 -			# packages.desc lets us search easily in DB
    1.24 -			cat >> $dbs/packages.desc <<EOT
    1.25 -$PACKAGE | $VERSION$EXTRAVERSION | $SHORT_DESC | $CATEGORY | $WEB_SITE
    1.26 -EOT
    1.27 -
    1.28 -			# packages.txt used by tazpkg-web also to provide
    1.29 -			# a human readable package list with version and description.
    1.30 -			cat >> $dbs/packages.txt <<EOT
    1.31 -$PACKAGE
    1.32 -$VERSION$EXTRAVERSION
    1.33 -$SHORT_DESC
    1.34 -$PACKED_SIZE ($UNPACKED_SIZE installed)
    1.35 -
    1.36 -EOT
    1.37 +#			# packages.desc lets us search easily in DB
    1.38 +#			cat >> $dbs/packages.desc <<-EOT
    1.39 +#				$PACKAGE | $VERSION$EXTRAVERSION | $SHORT_DESC | $CATEGORY | $WEB_SITE
    1.40 +#			EOT
    1.41 +#
    1.42 +#			# packages.txt used by tazpkg-web also to provide
    1.43 +#			# a human readable package list with version and description.
    1.44 +#			cat >> $dbs/packages.txt <<-EOT
    1.45 +#				$PACKAGE
    1.46 +#				$VERSION$EXTRAVERSION
    1.47 +#				$SHORT_DESC
    1.48 +#				$PACKED_SIZE ($UNPACKED_SIZE installed)
    1.49 +#
    1.50 +#			EOT
    1.51  
    1.52  			# packages.info combines TazPkg separate files
    1.53  			# and will substitute them all
    1.54  			SIZES=$(echo $PACKED_SIZE $UNPACKED_SIZE | sed 's|\.0||g')
    1.55  			DEPENDS=$(echo $DEPENDS) # remove newlines from some receipts
    1.56  
    1.57 -			#MD5="$(fgrep " $PACKAGE-$VERSION$EXTRAVERSION.tazpkg" $PKGS/packages.md5 | awk '{print $1}')"
    1.58 -			cp $pack/md5sum $rsumf
    1.59 -			md5sum $pack/receipt | sed 's| [^ ]*/| |' >> $rsumf
    1.60 -			[ -e "$pack/description.txt" ] && md5sum $pack/description.txt | sed 's| [^ ]*/| |' >> $rsumf
    1.61 -			rsum=$(md5sum $rsumf | awk '{print $1}')
    1.62 +#			#MD5="$(fgrep " $PACKAGE-$VERSION$EXTRAVERSION.tazpkg" $PKGS/packages.md5 | awk '{print $1}')"
    1.63  
    1.64 -			cat >> $dbs/packages.info <<EOT
    1.65 -$PACKAGE	$VERSION$EXTRAVERSION	$CATEGORY	$SHORT_DESC	$WEB_SITE	$TAGS	$SIZES	$DEPENDS	$rsum	$PROVIDE
    1.66 -EOT
    1.67 +			# RSUM defined in new "small" receipts, but may be absent in old
    1.68 +			if [ -z "$RSUM" ]; then
    1.69 +				cp $pack/md5sum $rsumf
    1.70 +				md5sum $pack/receipt | sed 's| [^ ]*/| |' >> $rsumf
    1.71 +				[ -e "$pack/description.txt" ] && md5sum $pack/description.txt | sed 's| [^ ]*/| |' >> $rsumf
    1.72 +				RSUM=$(md5sum $rsumf | awk '{print $1}')
    1.73 +			fi
    1.74 +
    1.75 +			cat >> $dbs/packages.info <<-EOT
    1.76 +				$PACKAGE	$VERSION$EXTRAVERSION	$CATEGORY	$SHORT_DESC	$WEB_SITE	$TAGS	$SIZES	$DEPENDS	$RSUM	$PROVIDE
    1.77 +			EOT
    1.78  
    1.79  			# packages.equiv is used by tazpkg install to check depends.
    1.80  			for k in $PROVIDE; do
    1.81 @@ -264,6 +270,7 @@
    1.82  { _ 'Packages: %s - Time: %ss' "$nb" "$time"; newline; } | dblog
    1.83  
    1.84  # "Atomic" update now
    1.85 +ls -l $dbs
    1.86  cp -f $dbs/* $PKGS
    1.87  rm -r $dbs
    1.88