X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=examples%2Funrpm;h=7fd3676f6496e2e4444fcd48eb93c3f77b5b4b0c;hb=052ad9a56883a56742cec1afc6c1c8dfff222495;hp=2cd1aa9c9d9b806f5ab4e693eb8596eb425457f7;hpb=4bfb6b7b67ff4238fde52e4019efe2284b9f99ef;p=oweals%2Fbusybox.git

diff --git a/examples/unrpm b/examples/unrpm
index 2cd1aa9c9..7fd3676f6 100644
--- a/examples/unrpm
+++ b/examples/unrpm
@@ -1,14 +1,18 @@
 #!/bin/sh
 #
+# This should work with the GNU version of cpio and gzip!
+# This should work with the bash or ash shell!
+# Requires the programs (cpio, gzip, and the pager more or less).
+#
 usage() {
 echo "Usage: unrpm -l package.rpm            <List contents of rpm package>"
 echo "       unrpm -x package.rpm /foo/boo   <Extract rpm package to this directory,"
-echo "                                        put . for current directory>"  
+echo "                                        put . for current directory>"
 exit
 }
 
 rpm=$2
- 
+
 exist() {
 if [ "$rpm" = "" ]; then
 usage
@@ -24,7 +28,8 @@ elif [ "$1" = "-l" ]; then
 exist
 type more >/dev/null 2>&1 && pager=more
 type less >/dev/null 2>&1 && pager=less
-(echo -e "\nPress enter to scroll, q to Quit!\n" ; rpmunpack < $rpm | gunzip -c | cpio -tvf --quiet) | $pager 
+[ "$pager" = "" ] && echo "No pager found!" && exit
+(echo -e "\nPress enter to scroll, q to Quit!\n" ; rpm2cpio $rpm | cpio -tv --quiet) | $pager
 exit
 elif [ "$1" = "-x" ]; then
 exist
@@ -34,7 +39,7 @@ elif [ ! -d "$3" ]; then
 echo "No such directory $3!"
 exit
 fi
-rpmunpack < $rpm | gunzip | (cd $3 ; cpio -idmuv) || exit 
+rpm2cpio $rpm | (umask 0 ; cd $3 ; cpio -idmuv) || exit
 echo
 echo "Extracted $rpm to $3!"
 exit