[Debian-live-changes] r2368 - dists/trunk/live-helper/helpers

[otavio at alioth.debian.org]

Author: otavio
Date: 2007-07-02 13:57:40 +0000 (Mon, 02 Jul 2007)
New Revision: 2368

Modified:
   dists/trunk/live-helper/helpers/lh_binary_syslinux
Log:
Fix a cuple of "test before assigment" bugs.


Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-07-02 13:54:19 UTC (rev 2367)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-07-02 13:57:40 UTC (rev 2368)
@@ -72,9 +72,9 @@
 	APPEND="${4}"
 
 	# pxelinux and syslinux << 3.36 lacks support to file/path
+	DIRECTORY="/`basename ${DESTDIR_LIVE}`"
 	if [ "${LIVE_BINARY_IMAGES}" != "net" ] && [ "${DIRECTORY}" != "binary" ]
 	then
-		DIRECTORY="/`basename ${DESTDIR_LIVE}`"
 		KERNEL="${DIRECTORY}/${KERNEL}"
 		INITRD="${DIRECTORY}/${INITRD}"
 	fi
@@ -92,9 +92,9 @@
 	APPEND="${4}"
 
 	# pxelinux and syslinux << 3.36 lacks support to file/path
+	DIRECTORY="`basename ${DESTDIR_INSTALL}`"
 	if [ "${LIVE_BINARY_IMAGES}" != "net" ] && [ "${DIRECTORY}" != "binary" ]
 	then
-		DIRECTORY="/`basename ${DESTDIR_INSTALL}`"
 		KERNEL="${DIRECTORY}/${KERNEL}"
 		INITRD="${DIRECTORY}/${INITRD}"
 	fi