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

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-06-29 19:21:46 +0000 (Fri, 29 Jun 2007)
New Revision: 2283

Modified:
   dists/trunk/live-helper/helpers/lh_binary_disk
Log:


Modified: dists/trunk/live-helper/helpers/lh_binary_disk
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_disk	2007-06-29 19:13:13 UTC (rev 2282)
+++ dists/trunk/live-helper/helpers/lh_binary_disk	2007-06-29 19:21:46 UTC (rev 2283)
@@ -53,6 +53,33 @@
 
 mkdir -p binary/.disk
 
+ARCHITECTURE="`echo ${LIVE_ARCHITECTURE} | sed -e 's# #/#g'`"
+DISTRIBUTION="`echo ${LIVE_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]'`"
+DISTRIBUTION="${DISTRIBUTION}`echo ${LIVE_DISTRIBUTION} | cut -b 2-`"
+eval VERSION="$`echo ${VERSION}_${LIVE_DISTRIBUTION}`"
+
+case "${LH_MODE}" in
+	debian)
+		if [ -d binary/pool/main/b/base-installer ]
+		then
+			if [ -d binary/pool/main/l/live-installer ]
+			then
+				TYPE="LIVE/INSTALL"
+			fi
+
+			TYPE="LIVE/NETINST"
+		else
+			TYPE="LIVE"
+		fi
+
+		echo "Debian GNU/Linux \"${DISTRIBUTION}\" ${VERSION} - Official ${ARCHITECTURE} ${TYPE} Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info
+		;;
+
+	ubuntu)
+		echo "Ubuntu Linux \"${DISTRIBUTION}\" ${VERSION} - Unofficial ${ARCHITECTURE} LIVE/NETINST Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info
+		;;
+esac
+
 if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
 then
 	echo "main" > binary/.disk/base_components
@@ -61,33 +88,6 @@
 
 	echo "not_complete" > binary/.disk/cd_type
 
-	ARCHITECTURE="`echo ${LIVE_ARCHITECTURE} | sed -e 's# #/#g'`"
-	DISTRIBUTION="`echo ${LIVE_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]'`"
-	DISTRIBUTION="${DISTRIBUTION}`echo ${LIVE_DISTRIBUTION} | cut -b 2-`"
-	eval VERSION="$`echo ${VERSION}_${LIVE_DISTRIBUTION}`"
-
-	case "${LH_MODE}" in
-		debian)
-			if [ -d binary/pool/main/b/base-installer ]
-			then
-				if [ -d binary/pool/main/l/live-installer ]
-				then
-					TYPE="LIVE/INSTALL"
-				fi
-
-				TYPE="LIVE/NETINST"
-			else
-				TYPE="LIVE"
-			fi
-
-			echo "Debian GNU/Linux \"${DISTRIBUTION}\" ${VERSION} - Official ${ARCHITECTURE} ${TYPE} Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info
-			;;
-
-		ubuntu)
-			echo "Ubuntu Linux \"${DISTRIBUTION}\" ${VERSION} - Unofficial ${ARCHITECTURE} LIVE/NETINST Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info
-			;;
-	esac
-
 	#touch binary/.disk/mkisofs
 
 cat > binary/.disk/udeb_include << EOF