tazpkg rev 414 4.2.2

Fix extract_package
author Antoine Bodin <gokhlayeh@slitaz.org>
date Wed Jan 26 22:33:28 2011 +0100 (2011-01-26)
parents b88d2f6277cd
children 00b34cf95509
files tazpkg
line diff
     1.1 --- a/tazpkg	Wed Jan 26 14:52:10 2011 +0000
     1.2 +++ b/tazpkg	Wed Jan 26 22:33:28 2011 +0100
     1.3 @@ -21,7 +21,7 @@
     1.4  #           Antoine Bodin <gokhlayeh@mailoo.org>
     1.5  #           Christopher Rogers <slaxemulator@gmail.com>
     1.6  #
     1.7 -VERSION=4.2.1
     1.8 +VERSION=4.2.2
     1.9  
    1.10  ####################
    1.11  # Script variables #
    1.12 @@ -379,7 +379,7 @@
    1.13  extract_package()
    1.14  {
    1.15  	eval_gettext "Extracting \$PACKAGE... "
    1.16 -	cpio -idm --quiet < $PACKAGE.tazpkg && rm -f $PACKAGE.tazpkg
    1.17 +	cpio -idm --quiet < ${PACKAGE_FILE##*/} && rm -f ${PACKAGE_FILE##*/}
    1.18  	status
    1.19  	if [ -f fs.cpio.lzma ]; then
    1.20  		gettext "Extracting the pseudo fs... "
    1.21 @@ -496,7 +496,7 @@
    1.22  	  	[ "$i" == "$PACKAGE" ] && continue
    1.23  	  	[ -s $i/files.list ] || continue
    1.24  	  	awk "{ printf \"$i %s\\n\",\$1 }" < $i/files.list
    1.25 -	  done } | awk '
    1.26 +	  done; } | awk '
    1.27  {
    1.28  	if ($1 == "-" || file[$2] != "") {
    1.29  		file[$2] = file[$2] " " $1