Consistently use tab indenting in scripts/gutsy and scripts/sid

Ptach by Karl Goetz. Closes: #601821

r65224

2 files changed, 169 insertions, 168 deletions

diff --git a/scripts/gutsy b/scripts/gutsy
index 9c0a8b6..b93c6b6 100644
--- a/scripts/gutsy
+++ b/scripts/gutsy
@@ -1,20 +1,20 @@
 case $ARCH in
   amd64|i386)
-    default_mirror http://archive.ubuntu.com/ubuntu
-    ;;
+	default_mirror http://archive.ubuntu.com/ubuntu
+	;;
   sparc)
-    case $SUITE in
-      gutsy)
+	case $SUITE in
+	  gutsy)
 	default_mirror http://archive.ubuntu.com/ubuntu
 	;;
-      *)
+	  *)
 	default_mirror http://ports.ubuntu.com/ubuntu-ports
 	;;
-    esac
-    ;;
+	esac
+	;;
   *)
-    default_mirror http://ports.ubuntu.com/ubuntu-ports
-    ;;
+	default_mirror http://ports.ubuntu.com/ubuntu-ports
+	;;
 esac
 mirror_style release
 download_style apt
@@ -22,195 +22,196 @@ finddebs_style from-indices
 variants - buildd fakechroot minbase
 
 if doing_variant fakechroot; then
-    test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
+	test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
 fi
 
 case $ARCH in
-  alpha|ia64) LIBC="libc6.1" ;;
-  *)          LIBC="libc6" ;;
+	alpha|ia64) LIBC="libc6.1" ;;
+	*)          LIBC="libc6" ;;
 esac
 
 work_out_debs () {
-    required="$(get_debs Priority: required)"
-
-    if doing_variant -; then
-      #required="$required $(get_debs Priority: important)"
-      #  ^^ should be getting debconf here somehow maybe
-      base="$(get_debs Priority: important)"
-    elif doing_variant buildd; then
-      base="$(get_debs Build-Essential: yes)"
-    elif doing_variant fakechroot || doing_variant minbase; then
-      base="apt"
-    fi
+	required="$(get_debs Priority: required)"
+
+	if doing_variant -; then
+		#required="$required $(get_debs Priority: important)"
+		#  ^^ should be getting debconf here somehow maybe
+		base="$(get_debs Priority: important)"
+	elif doing_variant buildd; then
+		base="$(get_debs Build-Essential: yes)"
+	elif doing_variant fakechroot || doing_variant minbase; then
+		base="apt"
+	fi
 }
 
 first_stage_install () {
-    extract $required
+	extract $required
 
-    mkdir -p "$TARGET/var/lib/dpkg"
-    : >"$TARGET/var/lib/dpkg/status"
-    : >"$TARGET/var/lib/dpkg/available"
+	mkdir -p "$TARGET/var/lib/dpkg"
+	: >"$TARGET/var/lib/dpkg/status"
+	: >"$TARGET/var/lib/dpkg/available"
 
-    setup_etc
-    if [ ! -e "$TARGET/etc/fstab" ]; then
-        echo '# UNCONFIGURED FSTAB FOR BASE SYSTEM' > "$TARGET/etc/fstab"
-        chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
-    fi
+	setup_etc
+	if [ ! -e "$TARGET/etc/fstab" ]; then
+		echo '# UNCONFIGURED FSTAB FOR BASE SYSTEM' > "$TARGET/etc/fstab"
+		chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
+	fi
 
-    if doing_variant fakechroot; then
-        setup_devices_fakechroot
-    else
-        setup_devices
-    fi
+	if doing_variant fakechroot; then
+		setup_devices_fakechroot
+	else
+		setup_devices
+	fi
 
-    x_feign_install () {
-        local pkg="$1"
-        local deb="$(debfor $pkg)"
-        local ver="$(extract_deb_field "$TARGET/$deb" Version)"
+	x_feign_install () {
+		local pkg="$1"
+		local deb="$(debfor $pkg)"
+		local ver="$(extract_deb_field "$TARGET/$deb" Version)"
 
-        mkdir -p "$TARGET/var/lib/dpkg/info"
+		mkdir -p "$TARGET/var/lib/dpkg/info"
 
-        echo \
+		echo \
 "Package: $pkg
 Version: $ver
 Status: install ok installed" >> "$TARGET/var/lib/dpkg/status"
 
-        touch "$TARGET/var/lib/dpkg/info/${pkg}.list"
-    }
+		touch "$TARGET/var/lib/dpkg/info/${pkg}.list"
+	}
 
-    x_feign_install dpkg
+	x_feign_install dpkg
 }
 
 second_stage_install () {
-    x_core_install () {
-	smallyes '' | in_target dpkg --force-depends --install $(debfor "$@")
-    }
+	x_core_install () {
+		smallyes '' | in_target dpkg --force-depends --install $(debfor "$@")
+	}
 
-    p () {
-	baseprog="$(($baseprog + ${1:-1}))"
-    }
+	p () {
+		baseprog="$(($baseprog + ${1:-1}))"
+	}
 
-    if doing_variant fakechroot; then
-	setup_proc_fakechroot
-    else
-	setup_proc
-	in_target /sbin/ldconfig
-    fi
+	if doing_variant fakechroot; then
+		setup_proc_fakechroot
+	else
+		setup_proc
+		in_target /sbin/ldconfig
+	fi
 
-    DEBIAN_FRONTEND=noninteractive
-    DEBCONF_NONINTERACTIVE_SEEN=true
-    export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN
+	DEBIAN_FRONTEND=noninteractive
+	DEBCONF_NONINTERACTIVE_SEEN=true
+	export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN
 
-    baseprog=0
-    bases=7
+	baseprog=0
+	bases=7
 
-    p; progress $baseprog $bases INSTCORE "Installing core packages" #1
-    info INSTCORE "Installing core packages..."
+	p; progress $baseprog $bases INSTCORE "Installing core packages" #1
+	info INSTCORE "Installing core packages..."
 
-    p; progress $baseprog $bases INSTCORE "Installing core packages" #2
-    ln -sf mawk "$TARGET/usr/bin/awk"
-    x_core_install base-files base-passwd
-    p; progress $baseprog $bases INSTCORE "Installing core packages" #3
-    x_core_install dpkg
+	p; progress $baseprog $bases INSTCORE "Installing core packages" #2
+	ln -sf mawk "$TARGET/usr/bin/awk"
+	x_core_install base-files base-passwd
+	p; progress $baseprog $bases INSTCORE "Installing core packages" #3
+	x_core_install dpkg
 
-    if [ ! -e "$TARGET/etc/localtime" ]; then
-        ln -sf /usr/share/zoneinfo/Etc/UTC "$TARGET/etc/localtime"
-    fi
+	if [ ! -e "$TARGET/etc/localtime" ]; then
+		ln -sf /usr/share/zoneinfo/Etc/UTC "$TARGET/etc/localtime"
+	fi
 
-    if doing_variant fakechroot; then
-	install_fakechroot_tools
-    fi
+	if doing_variant fakechroot; then
+		install_fakechroot_tools
+	fi
 
-    p; progress $baseprog $bases INSTCORE "Installing core packages" #4
-    x_core_install $LIBC
+	p; progress $baseprog $bases INSTCORE "Installing core packages" #4
+	x_core_install $LIBC
 
-    p; progress $baseprog $bases INSTCORE "Installing core packages" #5
-    x_core_install perl-base
+	p; progress $baseprog $bases INSTCORE "Installing core packages" #5
+	x_core_install perl-base
 
-    p; progress $baseprog $bases INSTCORE "Installing core packages" #6
-    rm "$TARGET/usr/bin/awk"
-    x_core_install mawk
+	p; progress $baseprog $bases INSTCORE "Installing core packages" #6
+	rm "$TARGET/usr/bin/awk"
+	x_core_install mawk
 
-    p; progress $baseprog $bases INSTCORE "Installing core packages" #7
-    if doing_variant -; then
-      x_core_install debconf
-    fi
+	p; progress $baseprog $bases INSTCORE "Installing core packages" #7
+	if doing_variant -; then
+		x_core_install debconf
+	fi
 
-    baseprog=0
-    bases=$(set -- $required; echo $#)
+	baseprog=0
+	bases=$(set -- $required; echo $#)
 
-    info UNPACKREQ "Unpacking required packages..."
+	info UNPACKREQ "Unpacking required packages..."
 
-    smallyes '' |
-      (repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" \
-      dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 |
-      dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING) 7>&1
+	smallyes '' |
+		(repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" \
+		dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 |
+		dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING) 7>&1
 
-    info CONFREQ "Configuring required packages..."
+	info CONFREQ "Configuring required packages..."
 
-    if doing_variant fakechroot; then
+	if doing_variant fakechroot; then
 	# fix initscripts postinst (no mounting possible, and wrong if condition)
 	sed -i '/dpkg.*--compare-versions/ s/\<lt\>/lt-nl/' "$TARGET/var/lib/dpkg/info/initscripts.postinst"
-    fi
+	fi
 
-    mv "$TARGET/sbin/start-stop-daemon" "$TARGET/sbin/start-stop-daemon.REAL"
-    echo \
+	mv "$TARGET/sbin/start-stop-daemon" "$TARGET/sbin/start-stop-daemon.REAL"
+	echo \
 "#!/bin/sh
 echo
 echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/start-stop-daemon"
-    chmod 755 "$TARGET/sbin/start-stop-daemon"
+	chmod 755 "$TARGET/sbin/start-stop-daemon"
 
-    if [ -x "$TARGET/sbin/initctl" ]; then
-      mv "$TARGET/sbin/initctl" "$TARGET/sbin/initctl.REAL"
-      echo \
+	if [ -x "$TARGET/sbin/initctl" ]; then
+	  mv "$TARGET/sbin/initctl" "$TARGET/sbin/initctl.REAL"
+	  echo \
 "#!/bin/sh
 echo
 echo \"Warning: Fake initctl called, doing nothing\"" > "$TARGET/sbin/initctl"
-      chmod 755 "$TARGET/sbin/initctl"
-    fi
-
-    setup_dselect_method apt
-
-    smallyes '' |
-      (in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" \
-      dpkg --status-fd 8 --configure --pending --force-configure-any --force-depends 8>&1 1>&7 |
-      dpkg_progress $baseprog $bases CONFREQ "Configuring required packages" CONFIGURING) 7>&1
-
-    baseprog=0
-    bases="$(set -- $base; echo $#)"
-
-    info UNPACKBASE "Unpacking the base system..."
-
-    setup_available $required $base
-    done_predeps=
-    while predep=$(get_next_predep); do
-      # We have to resolve dependencies of pre-dependencies manually because
-      # dpkg --predep-package doesn't handle this.
-      predep=$(without "$(without "$(resolve_deps $predep)" "$required")" "$done_predeps")
-      # XXX: progress is tricky due to how dpkg_progress works
-      # -- cjwatson 2009-07-29
-      p; smallyes '' | in_target dpkg --force-overwrite --force-confold --skip-same-version --install $(debfor $predep)
-      base=$(without "$base" "$predep")
-      done_predeps="$done_predeps $predep"
-    done
-
-    smallyes '' |
-      (repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" \
-      dpkg --status-fd 8 --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 |
-      dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING) 7>&1
-
-    info CONFBASE "Configuring the base system..."
-
-    smallyes '' |
-      (repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be attempted 5 times." "" \
-      dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 |
-      dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING) 7>&1
-
-    if [ -x "$TARGET/sbin/initctl.REAL" ]; then
-      mv "$TARGET/sbin/initctl.REAL" "$TARGET/sbin/initctl"
-    fi
-    mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon"
-
-    progress $bases $bases CONFBASE "Configuring base system"
-    info BASESUCCESS "Base system installed successfully."
+	  chmod 755 "$TARGET/sbin/initctl"
+	fi
+
+	setup_dselect_method apt
+
+	smallyes '' |
+		(in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" \
+		dpkg --status-fd 8 --configure --pending --force-configure-any --force-depends 8>&1 1>&7 |
+		dpkg_progress $baseprog $bases CONFREQ "Configuring required packages" CONFIGURING) 7>&1
+
+	baseprog=0
+	bases="$(set -- $base; echo $#)"
+
+	info UNPACKBASE "Unpacking the base system..."
+
+	setup_available $required $base
+	done_predeps=
+	while predep=$(get_next_predep); do
+		# We have to resolve dependencies of pre-dependencies manually because
+		# dpkg --predep-package doesn't handle this.
+		predep=$(without "$(without "$(resolve_deps $predep)" "$required")" "$done_predeps")
+		# XXX: progress is tricky due to how dpkg_progress works
+		# -- cjwatson 2009-07-29
+		p; smallyes '' |
+		in_target dpkg --force-overwrite --force-confold --skip-same-version --install $(debfor $predep)
+		base=$(without "$base" "$predep")
+		done_predeps="$done_predeps $predep"
+	done
+
+	smallyes '' |
+		(repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" \
+		dpkg --status-fd 8 --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 |
+		dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING) 7>&1
+
+	info CONFBASE "Configuring the base system..."
+
+	smallyes '' |
+		(repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be attempted 5 times." "" \
+		dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 |
+		dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING) 7>&1
+
+	if [ -x "$TARGET/sbin/initctl.REAL" ]; then
+		mv "$TARGET/sbin/initctl.REAL" "$TARGET/sbin/initctl"
+	fi
+	mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon"
+
+	progress $bases $bases CONFBASE "Configuring base system"
+	info BASESUCCESS "Base system installed successfully."
 }
diff --git a/scripts/sid b/scripts/sid
index 42c4785..6d4c2bf 100644
--- a/scripts/sid
+++ b/scripts/sid
@@ -8,10 +8,10 @@ if doing_variant fakechroot; then
 fi
 
 case $ARCH in
-	alpha|ia64)	LIBC="libc6.1" ;;
-	kfreebsd-*)	LIBC="libc0.1" ;;
-	hurd-*)		LIBC="libc0.3" ;;
-	*)		LIBC="libc6" ;;
+	alpha|ia64) LIBC="libc6.1" ;;
+	kfreebsd-*) LIBC="libc0.1" ;;
+	hurd-*)     LIBC="libc0.3" ;;
+	*)          LIBC="libc6" ;;
 esac
 
 work_out_debs () {
@@ -47,7 +47,7 @@ first_stage_install () {
 	fi
 
 	if [ -x "$TARGET/usr/bin/md5sum.textutils" ] && \
-	   [ \! -e "$TARGET/usr/bin/md5sum" ]; then
+		[ \! -e "$TARGET/usr/bin/md5sum" ]; then
 		cp "$TARGET/usr/bin/md5sum.textutils" "$TARGET/usr/bin/md5sum"
 	fi
 
@@ -140,9 +140,9 @@ second_stage_install () {
 	exec 7>&1
 
 	smallyes '' |
-	  (repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" \
-	   dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 || echo EXITCODE $?) |
-	  dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING
+		(repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" \
+		dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 || echo EXITCODE $?) |
+		dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING
 
 	info CONFREQ "Configuring required packages..."
 
@@ -156,9 +156,9 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/
 	setup_dselect_method apt
 
 	smallyes '' |
-	  (in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" \
-	   dpkg --status-fd 8 --configure --pending --force-configure-any --force-depends 8>&1 1>&7 || echo EXITCODE $?) |
-	  dpkg_progress $baseprog $bases CONFREQ "Configuring required packages" CONFIGURING
+		(in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" \
+		dpkg --status-fd 8 --configure --pending --force-configure-any --force-depends 8>&1 1>&7 || echo EXITCODE $?) |
+		dpkg_progress $baseprog $bases CONFREQ "Configuring required packages" CONFIGURING
 
 	baseprog=0
 	bases="$(set -- $base; echo $#)"
@@ -174,22 +174,22 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/
 		# XXX: progress is tricky due to how dpkg_progress works
 		# -- cjwatson 2009-07-29
 		p; smallyes '' |
-		  in_target dpkg --force-overwrite --force-confold --skip-same-version --install $(debfor $predep)
+		in_target dpkg --force-overwrite --force-confold --skip-same-version --install $(debfor $predep)
 		base=$(without "$base" "$predep")
 		done_predeps="$done_predeps $predep"
 	done
 
 	smallyes '' |
-	  (repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" \
-	   dpkg --status-fd 8 --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 || echo EXITCODE $?) |
-	  dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING
+		(repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" \
+		dpkg --status-fd 8 --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 || echo EXITCODE $?) |
+		dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING
 
 	info CONFBASE "Configuring the base system..."
 
 	smallyes '' |
-	  (repeatn 5 in_target_failmsg CONF_BASE_FAIL "Failure while configuring base packages." "" \
-	   dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 || echo EXITCODE $?) |
-	  dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING
+		(repeatn 5 in_target_failmsg CONF_BASE_FAIL "Failure while configuring base packages." "" \
+		dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 || echo EXITCODE $?) |
+		dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING
 
 	mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon"