diff options
| author | P. J. McDermott <pjm@nac.net> | 2012-05-21 14:15:35 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pjm@nac.net> | 2012-05-21 14:18:24 (EDT) |
| commit | cb9f794cc59ac058bcd1ad751c68a60a507c9bb9 (patch) | |
| tree | 98c25a2c27d2f6b00cabc62f254d304a05bbb084 | |
| parent | c450b43eb9157ab6e80b1b1144912b21aed623e4 (diff) | |
Fix oh-copyconfig's compliance with format spec.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/oh-copyconfig.sh | 4 |
2 files changed, 8 insertions, 2 deletions
@@ -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 |