From d0bd2117bed30fe824ad0c8b1817c2793d051ac0 Mon Sep 17 00:00:00 2001
From: Frans Pop <fjp@debian.org>
Date: Mon, 20 Apr 2009 12:11:27 +0000
Subject: [PATCH] boot-x86 gets sourced: remove shebang; improve whitespace
 consistency

---
 tools/boot/lenny/boot-x86   | 18 +++++++++---------
 tools/boot/squeeze/boot-x86 |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tools/boot/lenny/boot-x86 b/tools/boot/lenny/boot-x86
index f5fcf647..645ed6eb 100644
--- a/tools/boot/lenny/boot-x86
+++ b/tools/boot/lenny/boot-x86
@@ -1,4 +1,4 @@
-#!/bin/bash
+# This script gets sourced from boot-i386 and boot-amd64.
 #
 # Do install stuff for x86, including making bootable CDs
 # Works with debian-installer
@@ -120,12 +120,12 @@ if [ "$NN" = "1" ]; then
 		fi
 	done
 
-    if [ -e "$MIRROR/tools" ] && \
-        [ ! -e $CDDIR/tools ] && \
-        [ "$OMIT_DOC_TOOLS" != "1" ] ; then
-        echo "  Adding tools to CD1"
-        $BASEDIR/tools/add_files $CDDIR $MIRROR tools
-    fi
+	if [ -e "$MIRROR/tools" ] && \
+	   [ ! -e $CDDIR/tools ] && \
+	   [ "$OMIT_DOC_TOOLS" != "1" ] ; then
+		echo "  Adding tools to CD1"
+		$BASEDIR/tools/add_files $CDDIR $MIRROR tools
+	fi
 fi
 
 extra_image () {
@@ -175,8 +175,8 @@ if [ "$THISTYPE" = "isolinux" ]; then
 	(ar p "$MIRROR/${SYSLINUXDEB}" data.tar.gz | \
 		tar zxf - -C $CDDIR/../syslinux ./usr/lib)
 
-    echo $SYSLINUXDEB >> $CDDIR/../$N.pkgs_extracted
-    $BASEDIR/tools/which_deb $MIRROR $DI_CODENAME syslinux source >> $CDDIR/../$N.pkgs_extracted
+	echo $SYSLINUXDEB >> $CDDIR/../$N.pkgs_extracted
+	$BASEDIR/tools/which_deb $MIRROR $DI_CODENAME syslinux source >> $CDDIR/../$N.pkgs_extracted
 
 	add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
 	add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes"
diff --git a/tools/boot/squeeze/boot-x86 b/tools/boot/squeeze/boot-x86
index aef467ba..1880c646 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#*http://}"
+		DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
 		DI_WWW_HOME=""                     
 		echo "Using images from $DI_DIR"
 	fi
@@ -175,8 +175,8 @@ if [ "$THISTYPE" = "isolinux" ]; then
 	(ar p "$MIRROR/${SYSLINUXDEB}" data.tar.gz | \
 		tar zxf - -C $CDDIR/../syslinux ./usr/lib)
 
-    echo $SYSLINUXDEB >> $CDDIR/../$N.pkgs_extracted
-    $BASEDIR/tools/which_deb $MIRROR $DI_CODENAME syslinux source >> $CDDIR/../$N.pkgs_extracted
+	echo $SYSLINUXDEB >> $CDDIR/../$N.pkgs_extracted
+	$BASEDIR/tools/which_deb $MIRROR $DI_CODENAME syslinux source >> $CDDIR/../$N.pkgs_extracted
 
 	add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
 	add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes"