[Debian-live-changes] r1006 - in dists/trunk/live-helper: doc helpers

[Daniel Baumann]

Author: daniel
Date: 2007-04-10 08:57:14 +0000 (Tue, 10 Apr 2007)
New Revision: 1006

Modified:
   dists/trunk/live-helper/doc/ChangeLog
   dists/trunk/live-helper/helpers/lh_binary_includes
Log:


Modified: dists/trunk/live-helper/doc/ChangeLog
===================================================================
--- dists/trunk/live-helper/doc/ChangeLog	2007-04-10 08:43:46 UTC (rev 1005)
+++ dists/trunk/live-helper/doc/ChangeLog	2007-04-10 08:57:14 UTC (rev 1006)
@@ -1,3 +1,8 @@
+2007-04-10  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_binary_includes, includes/*:
+	  - Redone.
+
 2007-04-09  Daniel Baumann  <daniel at debian.org>
 
 	* helpers/lh_binary_yaboot, templates/yaboot:

Modified: dists/trunk/live-helper/helpers/lh_binary_includes
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_includes	2007-04-10 08:43:46 UTC (rev 1005)
+++ dists/trunk/live-helper/helpers/lh_binary_includes	2007-04-10 08:57:14 UTC (rev 1006)
@@ -50,28 +50,6 @@
 # Checking stage file
 Check_stagefile .stage/binary_includes
 
-# usb hack
-for i in *.en.html; do rm -f `basename $i en.html`html; cp $i `basename $i .en.html`.html; done
-
-# template hack
-DEBIAN_NAME: Debian GNU/Linux 4.0 r0 "Etch" - Official amd64 NETINST Binary-1
-DEBIAN_DATE: 20070407-11:29
-DEBIAN_TOOLS:
-/tools/
-/tools/ and   /install/floppy/
-
- <P>
- <tt>&nbsp;
- <A href="tools/">/tools/</a>
- </tt>
-
- and
- <tt>&nbsp;
- <A href="install/floppy/">/install/floppy/</a>
- </tt>
-
-
-
 # Check includes
 if [ ! -d "${LIVE_INCLUDES}" ]
 then
@@ -84,18 +62,51 @@
 	fi
 fi
 
-if ls "${LIVE_INCLUDES}"/common/* &> /dev/null
+# Assemble architecture
+case "${LIVE_ARCHITECTURE}" in
+	amd64)
+		ARCH="amd"
+		;;
+
+	i386)
+		ARCH="386"
+		;;
+
+	powerpc)
+		ARCH="ppc"
+		;;
+esac
+
+if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
 then
-	cd "${LIVE_INCLUDES}"/common
-	find . | cpio -dmpu "${OLDPWD}"/binary
-	cd "${OLDPWD}"
-fi
+	# Copying d-i templates
+	if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install ] && \
+	ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install/* &> /dev/null
+	then
+		cp -r "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install/* binary
+	fi
 
-if ls "${LIVE_INCLUDES}"/"${LIVE_BINARY_IMAGE}"/* &> /dev/null
-then
-	cd "${LIVE_INCLUDES}"/"${LIVE_BINARY_IMAGE}"
-	find . | cpio -dmpu "${OLDPWD}"/binary
-	cd "${OLDPWD}"
+	if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}" ] && \
+	ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}"/* &> /dev/null
+	then
+		cp -r "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}"/* binary
+	fi
+
+	# Adjusting d-i templates
+	DEBIAN_NAME="/Debian GNU/Linux 4.0 r0 \"Etch\" - Unofficial amd64 NETINST/LIVE Binary-1"
+	DEBIAN_DATE="`date +%Y%m%d-%H:%M`"
+
+	if [ "${LIVE_ARCHITECTURE}" = "i386" ]
+	then
+		DEBIAN_TOOLS_HTML=" <P>\n <tt>&nbsp;\n <A href="tools/">/tools/</a>\n </tt>\n\n and\n <tt>&nbsp;\n <A href="install/floppy/">/install/floppy/</a>\n </tt>"
+		DEBIAN_TOOLS_TXT="/tools/ and   /install/floppy/"
+	else
+		DEBIAN_TOOLS_HTML=" <P>\n <tt>&nbsp;\n <A href="tools/">/tools/</a>\n </tt>\n\n\n\n\n\n"
+		DEBIAN_TOOLS_TXT="/tools/"
+	fi
+
+	sed -i -e "s/DEBIAN_NAME/${DEBIAN_NAME}/g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s/DEBIAN_TOOLS/${DEBIAN_TOOLS_HTML}/g" binary/README.html
+	sed -i -e "s/DEBIAN_NAME/${DEBIAN_NAME}/g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s/DEBIAN_TOOLS/${DEBIAN_TOOLS_TXT}/g" binary/README.txt
 fi
 
 # Creating stage file