From cb9f794cc59ac058bcd1ad751c68a60a507c9bb9 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Mon, 21 May 2012 14:15:35 -0400
Subject: Fix oh-copyconfig's compliance with format spec.

---
(limited to 'src')

diff --git a/src/oh-copyconfig.sh b/src/oh-copyconfig.sh
index 8b07397..39b4ba2 100644
--- a/src/oh-copyconfig.sh
+++ b/src/oh-copyconfig.sh
@@ -61,8 +61,8 @@ while read -r type src dest; do
 	mkdir -p "$(dirname "${full_dest}")"
 	# Find the config package files.
 	config_dir_base="/usr/share/config/${OH_HOST_PLATFORM}/${OH_SRCPKG}"
-	if [ -d "${config_dir_base}-${OH_PKGVER}" ]; then
-		full_src="${config_dir_base}-${OH_PKGVER}/${src}"
+	if [ -d "${config_dir_base}-${OH_PKGVER%%-*}" ]; then
+		full_src="${config_dir_base}-${OH_PKGVER%%-*}/${src}"
 	elif [ -d "${config_dir_base}" ]; then
 		full_src="${config_dir_base}/${src}"
 	else
--
cgit v0.9.1