From 799a06f4c2e6ad3f9c66688b826527a27cad17f6 Mon Sep 17 00:00:00 2001
From: Steve McIntyre <93sam@debian.org>
Date: Tue, 7 Apr 2009 23:31:03 +0000
Subject: [PATCH] Cope with changes to d-i daily-build mirroring

---
 tools/boot/squeeze/boot-alpha   |  2 +-
 tools/boot/squeeze/boot-armel   |  4 ++--
 tools/boot/squeeze/boot-hppa    | 10 +++++-----
 tools/boot/squeeze/boot-ia64    |  2 +-
 tools/boot/squeeze/boot-m68k    |  4 ++--
 tools/boot/squeeze/boot-mips    |  4 ++--
 tools/boot/squeeze/boot-mipsel  |  4 ++--
 tools/boot/squeeze/boot-powerpc |  4 ++--
 tools/boot/squeeze/boot-s390    |  2 +-
 tools/boot/squeeze/boot-sparc   |  4 ++--
 tools/boot/squeeze/boot-x86     |  2 +-
 11 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/tools/boot/squeeze/boot-alpha b/tools/boot/squeeze/boot-alpha
index 8e30b50d..df225fba 100755
--- a/tools/boot/squeeze/boot-alpha
+++ b/tools/boot/squeeze/boot-alpha
@@ -28,7 +28,7 @@ BOOTDIR=
 if [ "$DI_WWW_HOME" = "default" ];then
    DI_WWW_HOME="http://d-i.debian.org/daily-images/alpha/daily/cdrom/"
    if [ -n "$DI_DIR" ];then
-      DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
+      DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
       DI_WWW_HOME=""                     
    fi
 fi
diff --git a/tools/boot/squeeze/boot-armel b/tools/boot/squeeze/boot-armel
index a04490bd..3bd39247 100755
--- a/tools/boot/squeeze/boot-armel
+++ b/tools/boot/squeeze/boot-armel
@@ -19,8 +19,8 @@ INSTALLDIR=$CDDIR/install
 if [ "$DI_WWW_HOME" = "default" ];then
    DI_WWW_HOME="http://people.debian.org/~kmuto/d-i/images/daily"
    if [ -n "$DI_DIR" ];then
-      DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
-      DI_WWW_HOME=""                     
+       DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
+       DI_WWW_HOME=""                     
    fi
 fi
 if [ ! "$DI_DIST" ]; then
diff --git a/tools/boot/squeeze/boot-hppa b/tools/boot/squeeze/boot-hppa
index c3b10506..e656ea0a 100755
--- a/tools/boot/squeeze/boot-hppa
+++ b/tools/boot/squeeze/boot-hppa
@@ -14,11 +14,11 @@ set -e
 N=$1
 CDROOT=$2
 if [ "$DI_WWW_HOME" = "default" ];then
-   DI_WWW_HOME="http://d-i.debian.org/daily-images/hppa/daily/cdrom/2.6"
-   if [ -n "$DI_DIR" ];then
-      DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
-      DI_WWW_HOME=""                     
-   fi
+    DI_WWW_HOME="http://d-i.debian.org/daily-images/hppa/daily/cdrom/2.6"
+    if [ -n "$DI_DIR" ];then
+        DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
+        DI_WWW_HOME=""                     
+    fi
 fi
 if [ ! "$DI_DIST" ]; then
    DI_DIST="$DI_CODENAME"
diff --git a/tools/boot/squeeze/boot-ia64 b/tools/boot/squeeze/boot-ia64
index 2b293cc4..03ffc5a5 100755
--- a/tools/boot/squeeze/boot-ia64
+++ b/tools/boot/squeeze/boot-ia64
@@ -15,7 +15,7 @@ BOOTDIR=
 if [ "$DI_WWW_HOME" = "default" ];then
    DI_WWW_HOME="http://people.debian.org/~dannf/d-i/ia64/daily"
    if [ -n "$DI_DIR" ];then
-      DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
+      DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
       DI_WWW_HOME=""                     
    fi
 fi
diff --git a/tools/boot/squeeze/boot-m68k b/tools/boot/squeeze/boot-m68k
index ac02d8f7..62ef4478 100755
--- a/tools/boot/squeeze/boot-m68k
+++ b/tools/boot/squeeze/boot-m68k
@@ -18,8 +18,8 @@ if [ "$DI_WWW_HOME" = "default" ];then
 # Temporarily disabled to stop cron jobs complaining
 #   DI_WWW_HOME="http://people.debian.org/~smarenka/d-i/m68k/images/daily/"
    if [ -n "$DI_DIR" ];then
-      DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
-      DI_WWW_HOME=""                     
+       DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
+       DI_WWW_HOME=""                     
    fi
 elif [ "$DI_WWW_HOME" = "test" ];then
 # Temporarily disabled to stop cron jobs complaining
diff --git a/tools/boot/squeeze/boot-mips b/tools/boot/squeeze/boot-mips
index ee60544d..f8a3de82 100755
--- a/tools/boot/squeeze/boot-mips
+++ b/tools/boot/squeeze/boot-mips
@@ -16,8 +16,8 @@ CDROOT=$2
 if [ "$DI_WWW_HOME" = "default" ];then
    DI_WWW_HOME="http://d-i.debian.org/daily-images/mips/daily/"
    if [ -n "$DI_DIR" ];then
-      DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
-      DI_WWW_HOME=""                     
+       DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
+       DI_WWW_HOME=""                     
    fi
 fi
 if [ ! "$DI_DIST" ]; then
diff --git a/tools/boot/squeeze/boot-mipsel b/tools/boot/squeeze/boot-mipsel
index 74635ca5..8721bbd9 100755
--- a/tools/boot/squeeze/boot-mipsel
+++ b/tools/boot/squeeze/boot-mipsel
@@ -18,8 +18,8 @@ CDROOT=$2
 if [ "$DI_WWW_HOME" = "default" ];then
       DI_WWW_HOME="http://d-i.debian.org/daily-images/mipsel/daily/decstation/cdrom/"
    if [ -n "$DI_DIR" ];then
-      DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
-      DI_WWW_HOME=""                     
+       DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
+       DI_WWW_HOME=""                     
    fi
 fi
 if [ ! "$DI_DIST" ]; then
diff --git a/tools/boot/squeeze/boot-powerpc b/tools/boot/squeeze/boot-powerpc
index 5e64e7c2..bf7015c1 100755
--- a/tools/boot/squeeze/boot-powerpc
+++ b/tools/boot/squeeze/boot-powerpc
@@ -17,8 +17,8 @@ INSTALLDIR=$CDDIR/install
 if [ "$DI_WWW_HOME" = "default" ];then
    DI_WWW_HOME="http://people.debian.org/~wouter/d-i/powerpc/daily"
    if [ -n "$DI_DIR" ];then
-      DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
-      DI_WWW_HOME=""
+       DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
+       DI_WWW_HOME=""
    fi
 fi
 if [ ! "$DI_DIST" ]; then
diff --git a/tools/boot/squeeze/boot-s390 b/tools/boot/squeeze/boot-s390
index 701fe601..6b3796f6 100755
--- a/tools/boot/squeeze/boot-s390
+++ b/tools/boot/squeeze/boot-s390
@@ -32,7 +32,7 @@ fi
 if [ "$DI_WWW_HOME" = "default" ];then
    DI_WWW_HOME="https://lophos.multibuild.org/d-i/images/daily"
       if [ -n "$DI_DIR" -a -e "$DI_DIR/~${DI_WWW_HOME#*~}" ] ; then
-            DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
+          DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
 	    DI_WWW_HOME=""
       fi
 fi
diff --git a/tools/boot/squeeze/boot-sparc b/tools/boot/squeeze/boot-sparc
index 3a300f7c..d4cc3577 100755
--- a/tools/boot/squeeze/boot-sparc
+++ b/tools/boot/squeeze/boot-sparc
@@ -13,8 +13,8 @@ CDDIR=$2
 if [ "$DI_WWW_HOME" = "default" ];then
    DI_WWW_HOME="http://people.debian.org/~stappers/d-i/sparc/daily/cdrom"
    if [ -n "$DI_DIR" ];then
-      DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
-      DI_WWW_HOME=""                     
+       DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
+       DI_WWW_HOME=""                     
    fi
 fi
 if [ ! "$DI_DIST" ]; then
diff --git a/tools/boot/squeeze/boot-x86 b/tools/boot/squeeze/boot-x86
index b1a257ba..7773ccb5 100644
--- a/tools/boot/squeeze/boot-x86
+++ b/tools/boot/squeeze/boot-x86
@@ -22,7 +22,7 @@ if [ "$DI_WWW_HOME" = "default" ];then
 		DI_WWW_HOME="http://d-i.debian.org/daily-images/amd64/daily"
 	fi
 	if [ -n "$DI_DIR" ];then
-		DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
+        DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
 		DI_WWW_HOME=""                     
 		echo "Using images from $DI_DIR"
 	fi