- at least use macros that are used

[packages/rpm.git] / rpm-lzma-tukaani.patch

--- rpm-4.5/scripts/rpm2cpio	2008-08-19 10:31:53.658158936 +0300
+++ rpm-4.4.9/scripts/rpm2cpio	2008-10-05 00:44:53.976068978 +0300
@@ -24,13 +24,13 @@
 o=`expr $o + $hdrsize`
 
-comp=`dd if="$pkg" ibs=$o skip=1 count=1 2>/dev/null \
-      | dd bs=3 count=1 2>/dev/null`
+comp=$(dd if="$pkg" ibs=$o skip=1 count=1 2>/dev/null \
+      | dd bs=3 count=1 2> /dev/null)
 
-gz="`echo . | awk '{ printf("%c%c", 0x1f, 0x8b); }'`"
+gz="$(echo -en '\037\0213')"
 case "$comp" in
     BZh)      dd if="$pkg" ibs=$o skip=1 2>/dev/null | bunzip2 ;;
     "$gz"*)   dd if="$pkg" ibs=$o skip=1 2>/dev/null | gunzip ;;
     # no magic in old lzma format, if unknown we assume that's lzma for now
-    *)        dd if="$pkg" ibs=$o skip=1 2>/dev/null | lzma d -si -so ;;
+    *)        dd if="$pkg" ibs=$o skip=1 2>/dev/null | lzma -dc - ;;
     #*)        echo "Unrecognized rpm file: $pkg"; return 1 ;;
 esac