diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2021-04-20 20:22:24 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2021-06-09 21:19:19 +0000 |
| commit | ea6546fa1dd4fad52421585ebbfce56a07d8284d (patch) | |
| tree | 683e07c5dc3b71e3799b3ea2fc94446e8f41c1b7 | |
| parent | 29ed8efb3b1e834a5c6f4726fa2516a5af3266a9 (diff) | |
etcupdate: Trim trailing whitespace.
Reviewed by: imp
Differential Revision: https://reviews.freebsd.org/D29845
(cherry picked from commit ada7fd17d57fac3dbafff5a1b3268afb872c8b0b)
| -rwxr-xr-x | usr.sbin/etcupdate/etcupdate.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/etcupdate/etcupdate.sh b/usr.sbin/etcupdate/etcupdate.sh index f64e58e4ecd1..28f6cbb42aff 100755 --- a/usr.sbin/etcupdate/etcupdate.sh +++ b/usr.sbin/etcupdate/etcupdate.sh @@ -442,7 +442,7 @@ empty_destdir() # # $1 - first tree # $2 - second tree -# $3 - node name +# $3 - node name # $4 - label for first tree # $5 - label for second tree diffnode() @@ -867,7 +867,7 @@ merge_file() # $1 - pathname of the file to resolve (relative to DESTDIR) has_conflicts() { - + egrep -q '^(<{7}|\|{7}|={7}|>{7}) ' $CONFLICTS/$1 } @@ -1526,7 +1526,7 @@ EOF if [ -n "$preworld" ]; then > $WORKDIR/removed.files fi - + # The order for the following sections is important. In the # odd case that a directory is converted into a file, the # existing subfiles need to be removed if possible before the |