From a8ec0f66b4637cce5df13d1c9389ebb8b5e625cf Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Thu, 25 Oct 2012 18:35:10 -0400
Subject: Use "<<-" here-doc operator to allow indentation.

---
diff --git a/lib/package/2.sh b/lib/package/2.sh
index d9f049a..ad6750d 100644
--- a/lib/package/2.sh
+++ b/lib/package/2.sh
@@ -143,11 +143,11 @@ _ob_get_doc_files_2()
 		return ${?}
 	fi
 
-	cat <<EOF
-../copyright
-../changelog changelog.dist
-../README README.dist
-EOF
+	cat <<-EOF
+		../copyright
+		../changelog changelog.dist
+		../README README.dist
+		EOF
 	cat "${_OB_PACKAGE_DIR}/${_obgdf2_doc_pkg}.pkg/docs"
 
 	_ob_return 0
diff --git a/src/ob-buildenv.sh b/src/ob-buildenv.sh
index e08b5f1..e8acb9f 100644
--- a/src/ob-buildenv.sh
+++ b/src/ob-buildenv.sh
@@ -67,22 +67,22 @@ setup_toolchain()
 	# Set toolchain environment variables.
 	# NB: This is written for GNU Binutils and GCC and won't work for, e.g.,
 	# LLVM.
-	cat <<EOF
-AR='${tool_prefix}ar'
-AS='${tool_prefix}as'
-CC='${tool_prefix}gcc'
-CPP='${tool_prefix}cpp'
-CXX='${tool_prefix}g++'
-LD='${tool_prefix}ld'
-NM='${tool_prefix}nm'
-OBJCOPY='${tool_prefix}objcopy'
-OBJDUMP='${tool_prefix}objdump'
-RANLIB='${tool_prefix}ranlib'
-READELF='${tool_prefix}readelf'
-SIZE='${tool_prefix}size'
-STRINGS='${tool_prefix}strings'
-STRIP='${tool_prefix}strip'
-EOF
+	cat <<-EOF
+		AR='${tool_prefix}ar'
+		AS='${tool_prefix}as'
+		CC='${tool_prefix}gcc'
+		CPP='${tool_prefix}cpp'
+		CXX='${tool_prefix}g++'
+		LD='${tool_prefix}ld'
+		NM='${tool_prefix}nm'
+		OBJCOPY='${tool_prefix}objcopy'
+		OBJDUMP='${tool_prefix}objdump'
+		RANLIB='${tool_prefix}ranlib'
+		READELF='${tool_prefix}readelf'
+		SIZE='${tool_prefix}size'
+		STRINGS='${tool_prefix}strings'
+		STRIP='${tool_prefix}strip'
+		EOF
 }
 
 setup_build_flags()
diff --git a/src/ob-gencontrol.sh b/src/ob-gencontrol.sh
index 859e47a..d56973f 100644
--- a/src/ob-gencontrol.sh
+++ b/src/ob-gencontrol.sh
@@ -94,14 +94,14 @@ gen_control()
 
 	mkdir -p "${binary}.control"
 
-	cat >"${binary}.control/control" <<EOF
-Package: ${binary}
-Source: ${OPK_SOURCE}
-Version: ${version}
-Architecture: ${arch}
-Platform: ${plat}
-Maintainer: $(ob_get_source_parameter 'Maintainer')
-EOF
+	cat >"${binary}.control/control" <<-EOF
+		Package: ${binary}
+		Source: ${OPK_SOURCE}
+		Version: ${version}
+		Architecture: ${arch}
+		Platform: ${plat}
+		Maintainer: $(ob_get_source_parameter 'Maintainer')
+		EOF
 
 	if ${gen_rel}; then
 		for name in Essential Depends Recommends Suggests Pre-Depends \
@@ -128,10 +128,10 @@ EOF
 		done
 	fi
 
-	cat >>"${binary}.control/control" <<EOF
-Installed-Size: ${inst_size}
-Description:$(echo "${desc}" | sed 's/^/ /')
-EOF
+	cat >>"${binary}.control/control" <<-EOF
+		Installed-Size: ${inst_size}
+		Description:$(echo "${desc}" | sed 's/^/ /')
+		EOF
 
 	homepage="$(ob_get_source_parameter 'Homepage')"
 	if [ -n "${homepage}" ]; then
diff --git a/src/opkbuild.sh b/src/opkbuild.sh
index 9514013..e168a9a 100644
--- a/src/opkbuild.sh
+++ b/src/opkbuild.sh
@@ -222,13 +222,13 @@ setup_arch_plat()
 	fi
 
 	IFS='-' read OPK_BUILD_ARCH_CPU OPK_BUILD_ARCH_KERNEL OPK_BUILD_ARCH_LIBS \
-		<<EOF
-${OPK_BUILD_ARCH}
-EOF
+		<<-EOF
+			${OPK_BUILD_ARCH}
+			EOF
 	IFS='-' read OPK_HOST_ARCH_CPU OPK_HOST_ARCH_KERNEL OPK_HOST_ARCH_LIBS \
-		<<EOF
-${OPK_HOST_ARCH}
-EOF
+		<<-EOF
+			${OPK_HOST_ARCH}
+			EOF
 
 	{
 		read OPK_BUILD_ARCH_GNU
--
cgit v0.9.1