summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--src/oh-copyconfig.sh4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 75cb44e..f0799d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1.0.1 ()
+
+ [ P. J. McDermott ]
+ * Fix oh-copyconfig's compliance with source package format specification
+ section 8.
+
1.0.0 (2012-04-26)
[ P. J. McDermott ]
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