diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2018-10-28 09:00:07 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2018-10-28 09:00:07 +0000 |
| commit | e9cc0ab1a3871023e60273b0493f07dbc82e9741 (patch) | |
| tree | 17d49739369a35b6144d9c8b68394fde6de59176 /usr.sbin/syspatch | |
| parent | Update to tzdata2018g from ftp.iana.org (diff) | |
| download | wireguard-openbsd-e9cc0ab1a3871023e60273b0493f07dbc82e9741.tar.xz wireguard-openbsd-e9cc0ab1a3871023e60273b0493f07dbc82e9741.zip | |
Properly handle symlinks.
Diffstat (limited to 'usr.sbin/syspatch')
| -rw-r--r-- | usr.sbin/syspatch/syspatch.sh | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/usr.sbin/syspatch/syspatch.sh b/usr.sbin/syspatch/syspatch.sh index 25d14f92330..7ad55ed1265 100644 --- a/usr.sbin/syspatch/syspatch.sh +++ b/usr.sbin/syspatch/syspatch.sh @@ -1,6 +1,6 @@ #!/bin/ksh # -# $OpenBSD: syspatch.sh,v 1.138 2018/10/16 07:09:13 ajacoutot Exp $ +# $OpenBSD: syspatch.sh,v 1.139 2018/10/28 09:00:07 ajacoutot Exp $ # # Copyright (c) 2016, 2017 Antoine Jacoutot <ajacoutot@openbsd.org> # @@ -137,13 +137,17 @@ fetch_and_verify() install_file() { - # XXX handle hard and symbolic links, dir->file, file->dir? + # XXX handle hard link, dir->file, file->dir? local _dst=$2 _fgrp _fmode _fown _src=$1 [[ -f ${_src} && -f ${_dst} ]] - eval $(stat -f "_fmode=%OMp%OLp _fown=%Su _fgrp=%Sg" ${_src}) - - install -DFSp -m ${_fmode} -o ${_fown} -g ${_fgrp} ${_src} ${_dst} + if [[ -h ${_src} ]]; then + ln -sf $(readlink ${_src}) ${_dst} + else + eval $(stat -f "_fmode=%OMp%OLp _fown=%Su _fgrp=%Sg" ${_src}) + install -DFSp -m ${_fmode} -o ${_fown} -g ${_fgrp} ${_src} \ + ${_dst} + fi } ls_installed() |