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