Script updates for better portability

git-svn-id: svn://busybox.net/trunk/busybox@1430 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 7 insertions, 2 deletions

diff --git a/scripts/unrpm b/scripts/unrpm
index 2cd1aa9c9..9ab37be0a 100644
--- a/scripts/unrpm
+++ b/scripts/unrpm
@@ -1,5 +1,9 @@
 #!/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,"
@@ -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" ; rpmunpack < $rpm | gzip -dc | 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 
+rpmunpack < $rpm | gzip -d | (umask 0 ; cd $3 ; cpio -idmuv) || exit 
 echo
 echo "Extracted $rpm to $3!"
 exit