From 3322feeae7d9bd6fc5b79f0d8a5ebb96e339009e Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Sat, 21 Jan 2012 13:49:22 -0500
Subject: Rename data directories in work area.

Also, fix an 'rm' command in opkbuild.
---
(limited to 'src')

diff --git a/src/oh-buildopk b/src/oh-buildopk
index 4ca91c5..6e969ba 100644
--- a/src/oh-buildopk
+++ b/src/oh-buildopk
@@ -38,7 +38,7 @@ while [ ${#} -gt 0 ]; do
 	# Write debian-binary.
 	echo '2.0' > debian-binary
 	# Pack data.tar.gz.
-	cd ${1}
+	cd ${1}.data
 	tar -czf ../data.tar.gz .
 	cd ..
 	# Pack control.tar.gz.
diff --git a/src/oh-installfiles b/src/oh-installfiles
index ebd3f38..2297e53 100644
--- a/src/oh-installfiles
+++ b/src/oh-installfiles
@@ -44,10 +44,10 @@ while [ ${#} -gt 0 ]; do
 		# Ensure that the full directory path of the pattern exists in the
 		# package staging area.
 		pattern_dir=$(dirname ${pattern})
-		mkdir -p ${1}/${pattern_dir}
+		mkdir -p ${1}.data/${pattern_dir}
 		# Move any matching files from the installation destination to the
 		# package staging area.
-		mv dest/${pattern} ${1}/${pattern_dir}
+		mv dest/${pattern} ${1}.data/${pattern_dir}
 	done < ../${1}.pkg/install
 	shift
 done
diff --git a/src/opkbuild b/src/opkbuild
index 2c7e974..ec15c85 100644
--- a/src/opkbuild
+++ b/src/opkbuild
@@ -49,19 +49,19 @@ version=$(oh_get_field Version)
 
 # Build *-src package.
 printf 'opkbuild: Installing files for package "%s"...\n' "${srcpkg}-src"
-mkdir -p ${srcpkg}-src/usr/src/${srcpkg}_${version}
+mkdir -p ${srcpkg}-src.data/usr/src/${srcpkg}_${version}
 for file in ../*; do
 	case ${file} in
 		../tmp)
 			;;
 		../*)
-			cp -R ${file} ${srcpkg}-src/usr/src/${srcpkg}_${version}
+			cp -R ${file} ${srcpkg}-src.data/usr/src/${srcpkg}_${version}
 			;;
 	esac
 done
 oh-gencontrol -s
 oh-buildopk ${srcpkg}-src
-rm -Rf dest
+rm -Rf ${srcpkg}-src.data
 printf 'opkbuild: Package "%s" complete!\n\n' "${srcpkg}-src"
 
 # Build other binary packages.
--
cgit v0.9.1