From 5b99ad8e0afddcf5337cc83e8c548743e90f2d1d Mon Sep 17 00:00:00 2001
From: lace <>
Date: Wed, 24 Mar 2010 15:03:15 +0000
Subject: [PATCH] Fixes.

---
 src/OOo-LiveCD.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/OOo-LiveCD.sh b/src/OOo-LiveCD.sh
index 1195796..94bdf2e 100755
--- a/src/OOo-LiveCD.sh
+++ b/src/OOo-LiveCD.sh
@@ -27,16 +27,16 @@ test ! -e $ISO
 test ! -e $LOOPDEV
 test ! -e $LOOPDEV1
 test ! -e $MNT
-test -f $SELF
+test -e $SELF
 
 if [ ! -e $ISO64 ];then
-  test -f $KS
+  test -e "$KS"
   livecd-creator --config=$KS --fslabel=$BASE --cache=/var/cache/live
   test -e $ISO
   mv -f $ISO $ISO64
 fi
 if [ ! -e $ISO32 ];then
-  test -f $KS
+  test -e "$KS"
   setarch i686 livecd-creator --config=$KS --fslabel=$BASE --cache=/var/cache/live
   test -e $ISO
   mv -f $ISO $ISO32
@@ -72,7 +72,7 @@ default vesamenu.c32
 timeout 100
 
 menu background splash.jpg
-menu title Welcome to OOo-LiveCD!
+menu title Welcome to $BASE!
 menu color border 0 #ffffffff #00000000
 menu color sel 7 #ffffffff #ff000000
 menu color title 0 #ffffffff #00000000
@@ -93,19 +93,19 @@ menu default
 label linux0
   menu label Boot x86_64
   kernel vmlinuz0
-  append initrd=initrd0.img root=live:UUID=$UUID0 rootfstype=vfat ro liveimg live_dir=OOo-LiveCD-x86_64 quiet  rhgb rd_NO_LUKS rd_NO_MD noiswmd 
+  append initrd=initrd0.img root=live:UUID=$UUID0 rootfstype=vfat ro liveimg live_dir=$BASE-x86_64 quiet  rhgb rd_NO_LUKS rd_NO_MD noiswmd 
 label check0
   menu label Verify and Boot x86_64
   kernel vmlinuz0
-  append initrd=initrd0.img root=live:UUID=$UUID0 rootfstype=vfat ro liveimg live_dir=OOo-LiveCD-x86_64 quiet  rhgb check
+  append initrd=initrd0.img root=live:UUID=$UUID0 rootfstype=vfat ro liveimg live_dir=$BASE-x86_64 quiet  rhgb check
 label linux1
   menu label Boot i686
   kernel vmlinuz1
-  append initrd=initrd1.img root=live:UUID=$UUID1 rootfstype=vfat ro liveimg live_dir=OOo-LiveCD-i686 quiet  rhgb rd_NO_LUKS rd_NO_MD noiswmd 
+  append initrd=initrd1.img root=live:UUID=$UUID1 rootfstype=vfat ro liveimg live_dir=$BASE-i686 quiet  rhgb rd_NO_LUKS rd_NO_MD noiswmd 
 label check1
   menu label Verify and Boot i686
   kernel vmlinuz1
-  append initrd=initrd1.img root=live:UUID=$UUID1 rootfstype=vfat ro liveimg live_dir=OOo-LiveCD-i686 quiet  rhgb check
+  append initrd=initrd1.img root=live:UUID=$UUID1 rootfstype=vfat ro liveimg live_dir=$BASE-i686 quiet  rhgb check
 label memtest
   menu label Memory Test
   kernel memtest
@@ -114,7 +114,7 @@ label local
   localboot 0xffff
 EOH
 cp -p $SELF $MNT/
-if [ -e $KS ];then
+if [ -e "$KS" ];then
   cp -p $KS $MNT/
 fi
 umount $MNT
-- 
1.8.3.1