aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2021-04-20 20:22:24 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2021-04-20 20:22:24 +0000
commitada7fd17d57fac3dbafff5a1b3268afb872c8b0b (patch)
tree6fdcfb600c73621cce8cf91a1f0483a3d0a7010a
parent1f7afa9364805a912270c9d6a70dc4a889d47a4e (diff)
downloadsrc-ada7fd17d57fac3dbafff5a1b3268afb872c8b0b.tar.gz
src-ada7fd17d57fac3dbafff5a1b3268afb872c8b0b.zip
etcupdate: Trim trailing whitespace.
Reviewed by: imp MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D29845
-rwxr-xr-xusr.sbin/etcupdate/etcupdate.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/etcupdate/etcupdate.sh b/usr.sbin/etcupdate/etcupdate.sh
index d0c27805562e..2b14b3a4d71b 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