Use `rm -rf' on locale files, so works with RHEL 5.

[febootstrap.git] / febootstrap-minimize.sh

diff --git a/febootstrap-minimize.sh b/febootstrap-minimize.sh
index 90915e3..148de5c 100755 (executable)
--- a/febootstrap-minimize.sh
+++ b/febootstrap-minimize.sh
@@ -18,6 +18,8 @@
 #
 # Written by Richard W.M. Jones <rjones@redhat.com>
 
+unset CDPATH
+
 TEMP=`getopt \
         -o '' \
         --long help,all,none,keep-locales,drop-locales,keep-docs,drop-docs,keep-cracklib,drop-cracklib,keep-i18n,drop-i18n,keep-zoneinfo,drop-zoneinfo,keep-rpmdb,drop-rpmdb,keep-yum-cache,drop-yum-cache,keep-services,drop-services,keep-sln,drop-sln,keep-ldconfig,drop-ldconfig,no-pack-executables,pack-executables \
@@ -175,7 +177,7 @@ trap remove_tmpdir EXIT
 #----------------------------------------------------------------------
 
 if [ "$keep_locales" != "yes" ]; then
-    rm -f "$target"/usr/lib/locale/*
+    rm -rf "$target"/usr/lib/locale/*
     rm -rf "$target"/usr/share/locale
     rm -rf "$target"/usr/lib*/gconv
     rm -f "$target"/usr/bin/localedef
@@ -186,6 +188,7 @@ if [ "$keep_docs" != "yes" ]; then
     rm -rf "$target"/usr/share/man
     rm -rf "$target"/usr/share/doc
     rm -rf "$target"/usr/share/info
+    rm -rf "$target"/usr/share/gnome/help
 fi
 
 if [ "$keep_cracklib" != "yes" ]; then
@@ -283,10 +286,10 @@ if [ "$pack_executables" = "yes" ]; then
                  xargs file |
                  grep executable |
                  awk -F: '{print $1}'); do
-       base=$(basename $path)
-       cp $path $tmpdir
-       (cd $tmpdir && upx -q -q --best $base)
-       cat $tmpdir/$base > $path
-       rm $tmpdir/$base
+       base=$(basename "$path")
+       cp "$path" "$tmpdir"
+       (cd "$tmpdir" && upx -q -q --best "$base")
+       cat "$tmpdir"/"$base" > "$path"
+       rm "$tmpdir"/"$base"
     done
 fi