From ce1925503b0f8ea474bcb02c3d2bbdce0ebb3733 Mon Sep 17 00:00:00 2001
From: Luke Yelavich <themuso@ubuntu.com>
Date: Tue, 10 Jul 2007 21:03:20 +1000
Subject: [PATCH] * ubuntu-cd: Ensure correct flavours are chosen for edubuntu,
 and   ubuntu-server * ubuntu-sync:   - Ensure that powerpc isos are retrieved
 from the ports directory of     the appropriate origin.   - Ensure correct
 flavours are chosen for edubuntu, and ubuntu-server.

---
 ubuntu-cd   | 14 ++++++++++----
 ubuntu-sync | 19 ++++++++++++-------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/ubuntu-cd b/ubuntu-cd
index bb11a6a..ee61d60 100755
--- a/ubuntu-cd
+++ b/ubuntu-cd
@@ -1,8 +1,4 @@
 #!/bin/bash
-
-# Copyright 2006,2007 (C) Luke Yelavich <themuso@ubuntu.com>
-# License: GPLv2
-
 set -e
 
 # Get the latest CD snapshot release.
@@ -30,6 +26,16 @@ if [ "${Distro}" == "ubuntu" ]; then
 	Flavors="alternate desktop server"
 	Archs="i386"
 	#Archs="i386 amd64 powerpc"
+elif [ "${Distro}" == "edubuntu" ]; then
+	Origin="${Distro}/releases"
+	Flavors="desktop server serveraddon"
+	Archs="i386"
+	#Archs="i386 amd64"
+elif [ "${Distro}" == "ubuntu-server" ]; then
+	Origin="releases"
+	Flavors="server"
+	Archs="i386"
+	#Archs="i386 amd64"
 else
 	Origin="${Distro}/releases"
 	Flavors="alternate desktop"
diff --git a/ubuntu-sync b/ubuntu-sync
index c64f9e5..9678427 100755
--- a/ubuntu-sync
+++ b/ubuntu-sync
@@ -1,9 +1,6 @@
 #!/bin/bash
 set -e
 
-# Copyright 2006,2007 (C) Luke Yelavich <themuso@ubuntu.com>
-# License: GPLv2
-
 # Syncronise new ubuntu CD images, depending on command-line flags given.
 # If none are given, sync all images.
 
@@ -16,7 +13,7 @@ Ubuntu_Distro_Dir="$HOME/distros/ubuntu"
 Dist=gutsy
 
 # Only sync the oldest images, and only i386 images if low bandwidth.
-Low_Bandwidth=1
+Low_Bandwidth=0
 
 while [ -n "$1" ]; do
 	case "$1" in
@@ -68,9 +65,9 @@ do
 	
 	# Which flavors to download
 	if [ "${Current_Set}" == "edubuntu" ]; then
-		Flavors="install live"
+		Flavors="desktop server serveraddon"
 	elif [ "${Current_Set}" == "ubuntu-server" ]; then
-		Flavors="server live"
+		Flavors="server"
 	else
 		Flavors="alternate desktop"
 	fi
@@ -85,9 +82,17 @@ do
 
 	for arch in $Archs; do
 		for flavor in $Flavors; do
-			if rsync --partial-dir="${Ubuntu_Distro_Dir}/${Current_Set}/${Dist}/.partial" "rsync://cdimage.ubuntu.com/cdimage/${Origin}/daily/current/${Dist}-${flavor}-${arch}.iso" "${Dist}-${flavor}-${arch}.iso" ; then
+			if [ "${flavor}" == "desktop" ]; then
+				Is_Desktop=-live
+			fi
+			if [ "${arch}" == "powerpc" ]; then
+				Is_Ports=ports
+			fi
+			if rsync --partial-dir="${Ubuntu_Distro_Dir}/${Current_Set}/${Dist}/.partial" "rsync://cdimage.ubuntu.com/cdimage/${Origin}/${Is_Ports}/daily${Is_Desktop}/current/${Dist}-${flavor}-${arch}.iso" "${Dist}-${flavor}-${arch}.iso" ; then
 			        date > "${flavor}-${arch}-sync"
 			fi
+			unset Is_Desktop
+			unset Is_Ports
 		done
 	done
 done