unrpm: clean up

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

examples/unrpm

@@ -5,44 +5,49 @@
 # Requires the programs (cpio, gzip, and the pager more or less).
 #
 usage() {
-echo "Usage: unrpm -l package.rpm            <List contents of rpm package>"
+	cat <<EOF
-echo "       unrpm -x package.rpm /foo/boo   <Extract rpm package to this directory,"
+Usage: unrpm -l package.rpm            <List contents of rpm package>
-echo "                                        put . for current directory>"
+       unrpm -x package.rpm /foo/boo   <Extract rpm package to this directory,
-exit
+                                        put . for current directory>
+EOF
+	exit
 }
 
 rpm=$2
 
 exist() {
-if [ "$rpm" = "" ]; then
+	if [ -z "${rpm}" ]; then
-usage
+		usage
-elif [ ! -s "$rpm" ]; then
+	elif [ ! -s "${rpm}" ]; then
-echo "Can't find $rpm!"
+		echo "Can't find ${rpm}!"
-exit
+		exit 1
-fi
+	fi
 }
 
-if [ "$1" = "" ]; then
+if [ -z "$1" ]; then
-usage
+	usage
 elif [ "$1" = "-l" ]; then
-exist
+	exist
-type more >/dev/null 2>&1 && pager=more
+	type more >/dev/null 2>&1 && pager=more
-type less >/dev/null 2>&1 && pager=less
+	type less >/dev/null 2>&1 && pager=less
-[ "$pager" = "" ] && echo "No pager found!" && exit
+	[ "$pager" = "" ] && echo "No pager found!" && exit
-(echo -e "\nPress enter to scroll, q to Quit!\n" ; rpm2cpio $rpm | cpio -tv --quiet) | $pager
+	(
-exit
+		printf "\nPress enter to scroll, q to Quit!\n\n"
+		rpm2cpio "${rpm}" | cpio -tv --quiet
+	) | ${pager}
+	exit
 elif [ "$1" = "-x" ]; then
-exist
+	exist
-if [ "$3" = "" ]; then
+	if [ -z "$3" ]; then
-usage
+		usage
-elif [ ! -d "$3" ]; then
+	elif [ ! -d "$3" ]; then
-echo "No such directory $3!"
+		echo "No such directory $3!"
-exit
+		exit 1
-fi
+	fi
-rpm2cpio $rpm | (umask 0 ; cd $3 ; cpio -idmuv) || exit
+	rpm2cpio "${rpm}" | (umask 0 ; cd "$3" ; cpio -idmuv) || exit
-echo
+	echo
-echo "Extracted $rpm to $3!"
+	echo "Extracted ${rpm} to $3!"
-exit
+	exit
 else
-usage
+	usage
 fi