* util/grub.d/00_header.in: Add few missing quotes. Recognise *.jpeg

	as *.jpg.

diff --git a/ChangeLog b/ChangeLog
index 1fdd2a21b72fc011b424ba137bae955cf33d1574..1db00bc4dba66abcabdf5b4a694b6c6f1d64d51d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-09  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/grub.d/00_header.in: Add few missing quotes. Recognise *.jpeg
+       as *.jpg.
+
 2010-04-09  Mario Vazquez <mariovazq@gmail.com>
 
        GRUB_BACKGROUND support.

diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index beb9653da7dc17034e6baa9797b73c19c281451b..d181fdffc93de39b2ed116c00da1c90d548da91b 100644 (file)
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -84,22 +84,22 @@ fi
 
 if [ "x$gfxterm" = x1 ]; then
     # Make the font accessible
-    prepare_grub_to_access_device `${grub_probe} --target=device ${GRUB_FONT_PATH}`
+    prepare_grub_to_access_device `${grub_probe} --target=device "${GRUB_FONT_PATH}"`
 
     cat << EOF
-if loadfont `make_system_path_relative_to_its_root ${GRUB_FONT_PATH}` ; then
+if loadfont `make_system_path_relative_to_its_root "${GRUB_FONT_PATH}"` ; then
   set gfxmode=${GRUB_GFXMODE}
   insmod gfxterm
   insmod ${GRUB_VIDEO_BACKEND}
 EOF
-    if [ x$GRUB_THEME != x ] && [ -f $GRUB_THEME ] \
-       && is_path_readable_by_grub $GRUB_THEME; then
+    if [ "x$GRUB_THEME" != x ] && [ -f "$GRUB_THEME" ] \
+       && is_path_readable_by_grub "$GRUB_THEME"; then
        echo "Found theme: $GRUB_THEME" >&2
-       prepare_grub_to_access_device `${grub_probe} --target=device $GRUB_THEME` | sed -e "s/^/  /"
+       prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_THEME"` | sed -e "s/^/  /"
        cat << EOF
   insmod gfxmenu
 EOF
-       themedir="`dirname $GRUB_THEME`"
+       themedir="`dirname "$GRUB_THEME"`"
        for x in "$themedir"/*.pf2 "$themedir"/f/*.pf2; do
            if [ -f "$x" ]; then
                cat << EOF
@@ -107,7 +107,7 @@ EOF
 EOF
            fi
        done
-       if [ x"`echo "$themedir"/*.jpg`" != x"$themedir/*.jpg" ]; then
+       if [ x"`echo "$themedir"/*.jpg`" != x"$themedir/*.jpg" ] || [ x"`echo "$themedir"/*.jpeg`" != x"$themedir/*.jpeg" ]; then
            cat << EOF
   insmod jpeg
 EOF