From ca8bf77efd8ec9de7b8cf746d3ecd14c91a1346c Mon Sep 17 00:00:00 2001 From: William Cohen Date: Tue, 4 Nov 2008 16:51:15 -0500 Subject: Clean up formatting. Publican does not deal with tabs. --- .../en-US/extras/stapprep.sh | 23 +++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'doc/SystemTap_Beginners_Guide') diff --git a/doc/SystemTap_Beginners_Guide/en-US/extras/stapprep.sh b/doc/SystemTap_Beginners_Guide/en-US/extras/stapprep.sh index 1b2d3f14..6905c9cc 100755 --- a/doc/SystemTap_Beginners_Guide/en-US/extras/stapprep.sh +++ b/doc/SystemTap_Beginners_Guide/en-US/extras/stapprep.sh @@ -16,19 +16,20 @@ for VARIANT in debug kdump PAE xen; do done KERN_ARCH=`uname -m` KERN_REV=`echo $UNAME | sed s/.$KERN_ARCH//` # strip arch from uname -CANDIDATES="$KERNEL-$KERN_REV.$KERN_ARCH $KERNEL-devel-$KERN_REV.$KERN_ARCH \ -$KERNEL-debuginfo-$KERN_REV.$KERN_ARCH \ -kernel-debuginfo-common-$KERN_REV.$KERN_ARCH" -NEEDED=`rpm --qf "%{name}-%{version}-%{release}.%{arch}\n" -q $CANDIDATES | \ - grep "is not installed" | awk '{print $2}'` +CANDIDATES="$KERNEL-$KERN_REV.$KERN_ARCH \ + $KERNEL-devel-$KERN_REV.$KERN_ARCH \ + $KERNEL-debuginfo-$KERN_REV.$KERN_ARCH \ + kernel-debuginfo-common-$KERN_REV.$KERN_ARCH" +NEEDED=`rpm --qf "%{name}-%{version}-%{release}.%{arch}\n" \ + -q $CANDIDATES | grep "is not installed" | awk '{print $2}'` if [ "$NEEDED" != "" ]; then echo -e "Need to install the following packages:\n$NEEDED" if [ `id -u` = "0" ]; then #attempt download and install - DIR=`mktemp -d` || exit 1 - yumdownloader --enablerepo="*debuginfo*" $NEEDED --destdir=$DIR - check_error $? "problem downloading rpm(s) $NEEDED" - rpm --force -ivh $DIR/*.rpm - check_error $? "problem installing rpm(s) $NEEDED" - rm -r $DIR #cleanup + DIR=`mktemp -d` || exit 1 + yumdownloader --enablerepo="*debuginfo*" $NEEDED --destdir=$DIR + check_error $? "problem downloading rpm(s) $NEEDED" + rpm --force -ivh $DIR/*.rpm + check_error $? "problem installing rpm(s) $NEEDED" + rm -r $DIR #cleanup fi fi -- cgit