From a8ec0f66b4637cce5df13d1c9389ebb8b5e625cf Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Thu, 25 Oct 2012 18:35:10 -0400 Subject: Use "<<-" here-doc operator to allow indentation. --- (limited to 'src') 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 <"${binary}.control/control" <"${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" <>"${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 \ - <