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

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-07-06 16:02:24 +0000 (Fri, 06 Jul 2007)
New Revision: 2410

Modified:
   dists/trunk/live-helper/helpers/lh_binary_debian-installer
Log:


Modified: dists/trunk/live-helper/helpers/lh_binary_debian-installer
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_debian-installer	2007-07-06 13:52:28 UTC (rev 2409)
+++ dists/trunk/live-helper/helpers/lh_binary_debian-installer	2007-07-06 16:02:24 UTC (rev 2410)
@@ -140,22 +140,69 @@
 	fi
 fi
 
+# Debian Installer daily builds
+case "${LIVE_ARCHITECTURE}" in
+	alpha)
+		URL="http://people.debian.org/~vorlon/d-i/alpha/daily/"
+		;;
+
+	amd64)
+		URL="http://people.debian.org/~aba/d-i/images/daily/"
+		;;
+
+	arm)
+		URL="http://people.debian.org/~kmuto/d-i/images/daily/"
+		;;
+
+	hppa)
+		URL="http://people.debian.org/~kyle/d-i/hppa/daily/"
+		;;
+
+	i386)
+		URL="http://people.debian.org/~joeyh/d-i/images/daily/"
+		;;
+
+	ia64)
+		URL="http://people.debian.org/~dannf/d-i/images/daily/"
+		;;
+
+	m68k)
+		URL="http://people.debian.org/~smarenka/d-i/images-m68k/daily/"
+		;;
+
+	mips)
+		URL="http://people.debian.org/~ths/d-i/mips/images/daily/"
+		;;
+
+	mipsel)
+		URL="http://people.debian.org/~ths/d-i/mipsel/images/daily/"
+		;;
+
+	powerpc)
+		URL="http://people.debian.org/~wouter/d-i/powerpc/daily/"
+		;;
+
+	s390)
+		URL="http://lophos.multibuild.org/d-i/images/daily/"
+		;;
+
+	sparc)
+		URL="http://people.debian.org/~stappers/d-i/images/daily/"
+		;;
+
+	*)
+		Echo_error "No daily-builds found for your architecture."
+		exit 1
+		;;
+esac
+
 # Downloading debian-installer
 mkdir -p "${DESTDIR_DI}"
 
-if [ "${LIVE_DISTRIBUTION}" = "sid" ] # FIXME arch
+if [ "${LIVE_DISTRIBUTION}" = "sid" ]
 then
-	case "${LIVE_ARCHITECTURE}" in
-		amd64)
-			wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" http://people.debian.org/~aba/d-i/images/daily/${DI}/${DI_KERNEL}
-			wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" http://people.debian.org/~aba/d-i/images/daily/${DI}/initrd.gz
-			;;
-
-		i386)
-		 	wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" http://people.debian.org/~joeyh/d-i/images/daily/${DI}/${DI_KERNEL}
-			wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" http://people.debian.org/~joeyh/d-i/images/daily/${DI}/initrd.gz
-			;;
-	esac
+	wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" ${URL}/${DI}/${DI_KERNEL}
+	wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" ${URL}/${DI}/initrd.gz
 else
 	wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/"${DI_KERNEL}"
 	wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/initrd.gz
@@ -166,19 +213,10 @@
 then
 	mkdir -p "${DESTDIR_GI}"
 
-	if [ "${LIVE_DISTRIBUTION}" = "sid" ] # FIXME arch
+	if [ "${LIVE_DISTRIBUTION}" = "sid" ]
 	then
-		case "${LIVE_ARCHITECTURE}" in
-			amd64)
-				wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" http://people.debian.org/~aba/d-i/images/daily/${DI_GTK}/${DI_KERNEL}
-				wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" http://people.debian.org/~aba/d-i/images/daily/${DI_GTK}/initrd.gz
-				;;
-
-			i386)
-				wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" http://people.debian.org/~joeyh/d-i/images/daily/${DI_GTK}/${DI_KERNEL}
-				wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" http://people.debian.org/~joeyh/d-i/images/daily/${DI_GTK}/initrd.gz
-				;;
-		esac
+		wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" ${URL}/${DI_GTK}/${DI_KERNEL}
+		wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" ${URL}/${DI_GTK}/initrd.gz
 	else
 		wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI_GTK}"/"${DI_KERNEL}"
 		wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI_GTK}"/initrd.gz