Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.sbin/postinstall Do not test contents of non-existing Xr...
details: https://anonhg.NetBSD.org/src/rev/703f87891a7e
branches: trunk
changeset: 998247:703f87891a7e
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 dd6d20af08b3 -r 703f87891a7e 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
Home |
Main Index |
Thread Index |
Old Index