From c2a1ec410438283a86f936b346cccb24f53b0fc2 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Sat, 21 Jan 2012 13:00:19 -0500
Subject: Fix syntax errors in grouping commands.

---
(limited to 'src')

diff --git a/src/oh-gencontrol b/src/oh-gencontrol
index f7f3684..9636ee0 100644
--- a/src/oh-gencontrol
+++ b/src/oh-gencontrol
@@ -78,13 +78,13 @@ if ${is_src}; then
 
 	printf 'Package: %s' "${srcpkg}-src" > ${control}
 	printf 'Source: %s' "${srcpkg}" >> ${control}
-	{printf 'Version: ' && oh_get_field Version} >> ${control}
+	{ printf 'Version: ' && oh_get_field Version;} >> ${control}
 	[ ${?} -eq 1 ] && missing_field Version
 	printf 'Architecture: all' >> ${control}
 	# TODO: Calculate "Installed-Size".
-	{printf 'Maintainer: ' && oh_get_field Maintainer} >> ${control}
+	{ printf 'Maintainer: ' && oh_get_field Maintainer;} >> ${control}
 	[ ${?} -eq 1 ] && missing_field Maintainer
-	{printf 'Homepage: ' && oh_get_field Homepage} >> ${control}
+	{ printf 'Homepage: ' && oh_get_field Homepage;} >> ${control}
 else
 	if [ ${#} -ne 1 ]; then
 		print_usage "${0}" >&2
@@ -100,34 +100,34 @@ else
 	mkdir "${control_dir}"
 
 	# Binary and source package names and version.
-	{printf 'Package: ' && oh_get_field ${binpkg} Package} > ${control}
+	{ printf 'Package: ' && oh_get_field ${binpkg} Package;} > ${control}
 	[ ${?} -eq 1 ] && missing_field Package
-	{printf 'Source: ' && oh_get_field Source} >> ${control}
+	{ printf 'Source: ' && oh_get_field Source;} >> ${control}
 	[ ${?} -eq 1 ] && missing_field Source
-	{printf 'Version: ' && oh_get_field Version} >> ${control}
+	{ printf 'Version: ' && oh_get_field Version;} >> ${control}
 	[ ${?} -eq 1 ] && missing_field Version
 
 	# TODO: Handle architecture.
-	{printf 'Architecture: ' && oh_get_field ${binpkg} Architecture} \
+	{ printf 'Architecture: ' && oh_get_field ${binpkg} Architecture;} \
 		>> ${control}
 	[ ${?} -eq 1 ] && missing_field Architecture
 
 	# Optional fields.
-	{printf 'Essential: ' && oh_get_field ${binpkg} Essential} >> ${control}
-	{printf 'Depends: ' && oh_get_field ${binpkg} Depends} >> ${control}
-	{printf 'Recommends: ' && oh_get_field ${binpkg} Recommends} >> ${control}
-	{printf 'Suggests: ' && oh_get_field ${binpkg} Suggests} >> ${control}
-	{printf 'Pre-Depends: ' && oh_get_field ${binpkg} Pre-Depends} >> ${control}
-	{printf 'Conflicts: ' && oh_get_field ${binpkg} Conflictss} >> ${control}
-	{printf 'Provides: ' && oh_get_field ${binpkg} Provides} >> ${control}
-	{printf 'Replaces: ' && oh_get_field ${binpkg} Replaces} >> ${control}
+	{ printf 'Essential: ' && oh_get_field ${binpkg} Essential;} >> ${control}
+	{ printf 'Depends: ' && oh_get_field ${binpkg} Depends;} >> ${control}
+	{ printf 'Recommends: ' && oh_get_field ${binpkg} Recommends;} >> ${control}
+	{ printf 'Suggests: ' && oh_get_field ${binpkg} Suggests;} >> ${control}
+	{ printf 'Pre-Depends: ' && oh_get_field ${binpkg} Pre-Depends;} >> ${control}
+	{ printf 'Conflicts: ' && oh_get_field ${binpkg} Conflicts;} >> ${control}
+	{ printf 'Provides: ' && oh_get_field ${binpkg} Provides;} >> ${control}
+	{ printf 'Replaces: ' && oh_get_field ${binpkg} Replaces;} >> ${control}
 
 	# TODO: Calculate "Installed-Size".
-	{printf 'Maintainer: ' && oh_get_field Maintainer} >> ${control}
+	{ printf 'Maintainer: ' && oh_get_field Maintainer;} >> ${control}
 	[ ${?} -eq 1 ] && missing_field Maintainer
-	{printf 'Description: ' && oh_get_field ${binpkg} Description} >> ${control}
+	{ printf 'Description: ' && oh_get_field ${binpkg} Description;} >> ${control}
 	[ ${?} -eq 1 ] && missing_field Description
-	{printf 'Homepage: ' && oh_get_field Homepage} >> ${control}
+	{ printf 'Homepage: ' && oh_get_field Homepage;} >> ${control}
 
 	for script in preinst postinst prerm postrm; do
 		if [ -f ../${binpkg}.pkg/${script} ]; then
--
cgit v0.9.1