[Midnightbsd-cvs] src [11789] U trunk/etc/periodic/daily: use -u with diff

[laffer1 at midnightbsd.org]

Revision: 11789
          http://svnweb.midnightbsd.org/src/?rev=11789
Author:   laffer1
Date:     2018-07-11 19:58:09 -0400 (Wed, 11 Jul 2018)
Log Message:
-----------
use -u with diff

Modified Paths:
--------------
    trunk/etc/periodic/daily/110.clean-tmps
    trunk/etc/periodic/daily/200.backup-passwd

Property Changed:
----------------
    trunk/etc/periodic/daily/110.clean-tmps
    trunk/etc/periodic/daily/200.backup-passwd

Modified: trunk/etc/periodic/daily/110.clean-tmps
===================================================================
--- trunk/etc/periodic/daily/110.clean-tmps	2018-07-11 23:56:45 UTC (rev 11788)
+++ trunk/etc/periodic/daily/110.clean-tmps	2018-07-11 23:58:09 UTC (rev 11789)
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # $MidnightBSD$
-# $FreeBSD: src/etc/periodic/daily/110.clean-tmps,v 1.13 2004/02/28 04:58:40 ache Exp $
 #
 # Perform temporary directory cleaning so that long-lived systems
 # don't end up with excessively old files there.
@@ -46,8 +45,8 @@
 	    rc=$(for dir in $daily_clean_tmps_dirs
 		do
 		    [ ."${dir#/}" != ."$dir" -a -d $dir ] && cd $dir && {
-			find -d . -type f $args -delete $print
-			find -d . ! -name . -type d $dargs -delete $print
+			find -x -d . -type f $args -delete $print
+			find -x -d . ! -name . -type d $dargs -delete $print
 		    } | sed "s,^\\.,  $dir,"
 		done | tee /dev/stderr | wc -l)
 	    [ -z "$print" ] && rc=0


Property changes on: trunk/etc/periodic/daily/110.clean-tmps
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/etc/periodic/daily/200.backup-passwd
===================================================================
--- trunk/etc/periodic/daily/200.backup-passwd	2018-07-11 23:56:45 UTC (rev 11788)
+++ trunk/etc/periodic/daily/200.backup-passwd	2018-07-11 23:58:09 UTC (rev 11789)
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # $MidnightBSD$
-# $FreeBSD: src/etc/periodic/daily/200.backup-passwd,v 1.10 2001/11/14 09:30:01 cjc Exp $
 #
 
 # If there is a global system configuration file, suck it in.
@@ -42,8 +41,8 @@
 	    then
 		[ $rc -lt 1 ] && rc=1
 		echo "$host passwd diffs:"
-		diff -I '^#' $bak/master.passwd.bak /etc/master.passwd |\
-			sed 's/^\([<>] [^:]*\):[^:]*:/\1:(password):/'
+		diff -uI '^#' $bak/master.passwd.bak /etc/master.passwd |\
+			sed 's/^\([-+ ][^-+:]*\):[^:]*:/\1:(password):/'
 		mv $bak/master.passwd.bak $bak/master.passwd.bak2
 		cp -p /etc/master.passwd $bak/master.passwd.bak || rc=3
 	    fi
@@ -59,7 +58,7 @@
 	    then
 		[ $rc -lt 1 ] && rc=1
 		echo "$host group diffs:"
-		diff $bak/group.bak /etc/group
+		diff -u $bak/group.bak /etc/group
 		mv $bak/group.bak $bak/group.bak2
 		cp -p /etc/group $bak/group.bak || rc=3
 	    fi


Property changes on: trunk/etc/periodic/daily/200.backup-passwd
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property