diff options
| author | dougb <dougb@FreeBSD.org> | 2003-05-03 06:35:19 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2003-05-03 06:35:19 +0000 |
| commit | 9b11f27caeedc93902ffa345a6a08edb6ac35a14 (patch) | |
| tree | 828ec4744768d0baa435cb791f4d5730f3579048 /usr.sbin/mergemaster | |
| parent | 76bbaa0d89f96b401bc072c69b1a3a0834980525 (diff) | |
| download | FreeBSD-src-9b11f27caeedc93902ffa345a6a08edb6ac35a14.zip FreeBSD-src-9b11f27caeedc93902ffa345a6a08edb6ac35a14.tar.gz | |
Preserve directory structure in PRESERVED_FILES_DIR to avoid
filename collisions.
Submitted by: des
Diffstat (limited to 'usr.sbin/mergemaster')
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index b444023..66d8cf3 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -656,8 +656,8 @@ do_install_and_rm () { case "${PRESERVE_FILES}" in [Yy][Ee][Ss]) if [ -f "${3}/${2##*/}" ]; then - mkdir -p ${PRESERVE_FILES_DIR} - cp ${3}/${2##*/} ${PRESERVE_FILES_DIR} + mkdir -p ${PRESERVE_FILES_DIR}/${2%/*} + cp ${3}/${2##*/} ${PRESERVE_FILES_DIR}/${2%/*} fi ;; esac |
