diff --git a/modules/installer/grub/grub-menu-builder.sh b/modules/installer/grub/grub-menu-builder.sh
index c6e30782822..59c35c91179 100644
--- a/modules/installer/grub/grub-menu-builder.sh
+++ b/modules/installer/grub/grub-menu-builder.sh
@@ -45,13 +45,13 @@ fi
 prologue() {
     case "$grubVersion" in
 	1)
-            cp -f "@splashImage@" /boot/background.xpm.gz
 	    cat > "$1" << GRUBEND
 # Automatically generated.  DO NOT EDIT THIS FILE!
 default @default@
 timeout @timeout@
 GRUBEND
-	    if test -n "@splashImage@"; then
+	    if [ -n "@splashImage@" ]; then
+                cp -f "@splashImage@" /boot/background.xpm.gz
                 echo "splashimage $bootRoot/background.xpm.gz" >> "$1"
             fi
 	    ;;
@@ -147,7 +147,7 @@ copyToKernelsDir() {
     # kernels or initrd if this script is ever interrupted.
     if ! test -e $dst; then
         local dstTmp=$dst.tmp.$$
-        cp $src $dstTmp
+        cp "$src" "$dstTmp"
         mv $dstTmp $dst
     fi
     filesCopied[$dst]=1