From 26cb9b940013716a549e7cb8a9f37d2ffe97f405 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Wed, 11 Apr 2012 16:42:29 -0400
Subject: Fix pathname expansion in oh-installfiles.

---
(limited to 'src')

diff --git a/src/oh-installfiles.sh b/src/oh-installfiles.sh
index 73a27a4..5598412 100644
--- a/src/oh-installfiles.sh
+++ b/src/oh-installfiles.sh
@@ -44,14 +44,14 @@ while [ ${#} -gt 0 ]; do
 
 	# Loop over lines in the 'install' file.
 	while read -r pattern; do
-		for file in ${pattern}; do
+		for file in dest/${pattern}; do
 			# Ensure that the full directory path of the pattern exists in the
 			# package staging area.
-			dir=$(dirname ${file})
+			dir=$(dirname ${file#dest/})
 			mkdir -p ${1}.data/${dir} || exit 1
 			# Move any matching files from the installation destination to the
 			# package staging area.
-			mv dest/${file} ${1}.data/${dir} || exit 1
+			mv ${file} ${1}.data/${dir} || exit 1
 		done
 	done < ../${1}.pkg/install
 	shift
--
cgit v0.9.1