diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2014-09-13 12:00:52 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2014-09-13 12:00:52 +0000 |
| commit | 3b08d2653c2a9eedd96b88497d2df810866816a7 (patch) | |
| tree | 80f76b3bde9331b14d64d438b76c60e588726551 | |
| parent | remove invalid cpuid.ph entries (diff) | |
| download | wireguard-openbsd-3b08d2653c2a9eedd96b88497d2df810866816a7.tar.xz wireguard-openbsd-3b08d2653c2a9eedd96b88497d2df810866816a7.zip | |
In PKG mode, cope with non-default PREFIX (e.g. /var/www/...).
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 29d7d0571ce..2ad1a626ae5 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.188 2014/09/09 08:53:51 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.189 2014/09/13 12:00:52 ajacoutot Exp $ # # Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> @@ -157,9 +157,12 @@ sm_cp_pkg_samples() { # knowledge of the required owner/group/mode # (e.g. /var/www/usr/sbin in mail/femail,-chroot) _pkghier=${_sample[5]%/*} - if [[ ! -d ${_pkghier} ]]; then + if [[ ! -d ${_pkghier#${_TMPROOT}} ]]; then sm_warn "skipping ${_sample[5]#${_TMPROOT}}: ${_pkghier#${_TMPROOT}} does not exist" continue + else + # non-default prefix (e.g. mail/roundcubemail) + install -d ${_pkghier} fi install ${_install_args} \ ${_sample[4]} ${_sample[5]} || _ret=1 |