# HG changeset patch # User Antoine Bodin # Date 1296077608 -3600 # Node ID e1c400f9e59b65f478d1ad8174a5032876762205 # Parent b88d2f6277cd7e8bf88a458b9cdc0a1a88b46eeb Fix extract_package diff -r b88d2f6277cd -r e1c400f9e59b tazpkg --- a/tazpkg Wed Jan 26 14:52:10 2011 +0000 +++ b/tazpkg Wed Jan 26 22:33:28 2011 +0100 @@ -21,7 +21,7 @@ # Antoine Bodin # Christopher Rogers # -VERSION=4.2.1 +VERSION=4.2.2 #################### # Script variables # @@ -379,7 +379,7 @@ extract_package() { eval_gettext "Extracting \$PACKAGE... " - cpio -idm --quiet < $PACKAGE.tazpkg && rm -f $PACKAGE.tazpkg + cpio -idm --quiet < ${PACKAGE_FILE##*/} && rm -f ${PACKAGE_FILE##*/} status if [ -f fs.cpio.lzma ]; then gettext "Extracting the pseudo fs... " @@ -496,7 +496,7 @@ [ "$i" == "$PACKAGE" ] && continue [ -s $i/files.list ] || continue awk "{ printf \"$i %s\\n\",\$1 }" < $i/files.list - done } | awk ' + done; } | awk ' { if ($1 == "-" || file[$2] != "") { file[$2] = file[$2] " " $1