[src/trunk]: src/usr.sbin/postinstall Do not test contents of non-existing Xr...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b65e61f02b93
branches:  trunk
changeset: 455751:b65e61f02b93
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Apr 11 14:45:58 2019 +0000

description:
Do not test contents of non-existing Xresource file (if X11 sets have
not been installed)

diffstat:

 usr.sbin/postinstall/postinstall |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r a8e4962e3bfe -r b65e61f02b93 usr.sbin/postinstall/postinstall
--- a/usr.sbin/postinstall/postinstall  Thu Apr 11 14:38:05 2019 +0000
+++ b/usr.sbin/postinstall/postinstall  Thu Apr 11 14:45:58 2019 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: postinstall,v 1.224 2019/03/09 23:46:34 mrg Exp $
+# $NetBSD: postinstall,v 1.225 2019/04/11 14:45:58 martin Exp $
 #
 # Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1857,7 +1857,8 @@
        done
 
        # check if xdm resources have been updated
-       if ! ${GREP} 'inpColor:' ${_etcx11}/xdm/Xresources > /dev/null; then
+       if [ -r ${_etcx11}/xdm/Xresources ] && \
+           ! ${GREP} 'inpColor:' ${_etcx11}/xdm/Xresources > /dev/null; then
                msg "Update ${_etcx11}/xdm/Xresources${_notfixed}"
                failed=1
        fi