From 888b97fbda8aa867816770fb495dad105411a3eb Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Tue, 25 Dec 2018 16:11:38 -0500
Subject: ob-*: Move function definitions before points of use

---
(limited to 'src/ob-gencontrol.sh')

diff --git a/src/ob-gencontrol.sh b/src/ob-gencontrol.sh
index 0a3817c..9b0a241 100644
--- a/src/ob-gencontrol.sh
+++ b/src/ob-gencontrol.sh
@@ -19,35 +19,6 @@
 
 . "${LIBDATADIR}/libopkbuild.${SHSOEXT}.${LIBOPKBUILD_SHSOVERSION}"
 
-main()
-{
-	ob_set_text_domain 'opkbuild'
-
-	ob_init_package '..' || exit 1
-	ob_parse_package_metadata -c '.opkbuild.cache' || exit 1
-
-	if [ -n "${OB_DO_SOURCE}" ]; then
-		gen_control "src-${OPK_SOURCE}" "${OPK_SOURCE_VERSION}" 'src' 'all' \
-			"${OPK_SOURCE} source package" 'false'
-		gen_md5sums "src-${OPK_SOURCE}"
-	else
-		for pkg in ${OPK_PACKAGES_REDUCED}; do
-			ob_set_package_substvars "${pkg}"
-			arch="$(ob_get_binary_parameter "${pkg}" 'Architecture')"
-			[ "${arch}" != 'all' ] && arch="${OPK_HOST_ARCH}"
-			plat="$(ob_get_binary_parameter "${pkg}" 'Platform')"
-			[ "${plat}" != 'all' ] && plat="${OPK_HOST_PLAT}"
-			desc="$(ob_get_binary_parameter "${pkg}" 'Description')"
-			desc="$(ob_substvars "${desc}")"
-			gen_control "${pkg}" "${OPK_BINARY_VERSION}" "${arch}" "${plat}" \
-				"${desc}" 'true'
-			install_maintainer_scripts "${pkg}"
-			gen_conffiles "${pkg}"
-			gen_md5sums "${pkg}"
-		done
-	fi
-}
-
 gen_control()
 {
 	binary="${1}"
@@ -180,4 +151,33 @@ gen_md5sums()
 	fi
 }
 
+main()
+{
+	ob_set_text_domain 'opkbuild'
+
+	ob_init_package '..' || exit 1
+	ob_parse_package_metadata -c '.opkbuild.cache' || exit 1
+
+	if [ -n "${OB_DO_SOURCE}" ]; then
+		gen_control "src-${OPK_SOURCE}" "${OPK_SOURCE_VERSION}" 'src' 'all' \
+			"${OPK_SOURCE} source package" 'false'
+		gen_md5sums "src-${OPK_SOURCE}"
+	else
+		for pkg in ${OPK_PACKAGES_REDUCED}; do
+			ob_set_package_substvars "${pkg}"
+			arch="$(ob_get_binary_parameter "${pkg}" 'Architecture')"
+			[ "${arch}" != 'all' ] && arch="${OPK_HOST_ARCH}"
+			plat="$(ob_get_binary_parameter "${pkg}" 'Platform')"
+			[ "${plat}" != 'all' ] && plat="${OPK_HOST_PLAT}"
+			desc="$(ob_get_binary_parameter "${pkg}" 'Description')"
+			desc="$(ob_substvars "${desc}")"
+			gen_control "${pkg}" "${OPK_BINARY_VERSION}" "${arch}" "${plat}" \
+				"${desc}" 'true'
+			install_maintainer_scripts "${pkg}"
+			gen_conffiles "${pkg}"
+			gen_md5sums "${pkg}"
+		done
+	fi
+}
+
 main "${@}"
--
cgit v0.9.1