--- trunk/mlivecdbuild/mlivecdbuild2.sh	2007/04/19 17:09:17	472
+++ trunk/mlivecdbuild/mlivecdbuild2.sh	2007/04/19 17:13:20	473
@@ -72,7 +72,7 @@
 	local var="$1"
 
 	# sanity checks
-	[ -z "${CDCHROOTDIR}" ] && die "\$CDCHROOTDIR not given."
+	[[ -z ${CDCHROOTDIR} ]] && die "\$CDCHROOTDIR not given."
 	echo "${var}" >> ${CDCHROOTDIR}/.installrc || die "add_initrc() adding \$var"
 }
 
@@ -133,7 +133,7 @@
 	echo Preparing LiveCD ISO Image ...
 
 	# fixes some issues with xfree/xorg xkb
-	if [ -L "${CDCHROOTDIR}/etc/X11/xkb" -a -d "/usr/X11R6/lib/X11/xkb" ]
+	if [[ -L ${CDCHROOTDIR}/etc/X11/xkb ]] && [[ -d /usr/X11R6/lib/X11/xkb ]]
 	then
 		rm ${CDCHROOTDIR}/etc/X11/xkb || die
 		mv ${CDCHROOTDIR}/usr/X11R6/lib/X11/xkb ${CDCHROOTDIR}/etc/X11 || die