[BACK]Return to diff.sh CVS log [TXT][DIR] Up to [local] / src / distrib / syspatch
File: [local] / src / distrib / syspatch / diff.sh (download)

Revision 1.6, Sun May 12 14:57:30 2019 UTC (5 years ago) by robert
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE, OPENBSD_7_5, OPENBSD_7_4_BASE, OPENBSD_7_4, OPENBSD_7_3_BASE, OPENBSD_7_3, OPENBSD_7_2_BASE, OPENBSD_7_2, OPENBSD_7_1_BASE, OPENBSD_7_1, OPENBSD_7_0_BASE, OPENBSD_7_0, OPENBSD_6_9_BASE, OPENBSD_6_9, OPENBSD_6_8_BASE, OPENBSD_6_8, OPENBSD_6_7_BASE, OPENBSD_6_7, OPENBSD_6_6_BASE, OPENBSD_6_6, HEAD
Changes since 1.5: +20 -6 lines 

use readlink(1) on each file that we think is different to ensure that
only the resolved path is included

ok ajacoutot@, tb@

#!/bin/ksh
#
# $OpenBSD: diff.sh,v 1.6 2019/05/12 14:57:30 robert Exp $
#
# Copyright (c) 2017, 2019 Robert Nagy <robert@openbsd.org>
#
# Permission to use, copy, modify, and distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
# copyright notice and this permission notice appear in all copies.
#
# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

umask 0022

trap exit HUP INT TERM

[[ "$1" != /* ]] || [[ "$2" != /* ]] &&
	echo "paths have to be absolute" &&
	exit 1

plist=$(mktemp)
trap 'rm -f ${plist}' EXIT

padd() {
	local _path=$1
	readlink -f ${_path} >> ${plist}
}

diff -Parq $1 $2 2>&1 | grep ' differ$' |
while IFS= read -r _d
do
	_o=$(echo $_d | cut -d ' ' -f2)
	_n=$(echo $_d | cut -d ' ' -f4)
	case "${_o##*.}"
	in
		a)
			cmp -s ${_o} ${_n} 34 34 || padd ${_n}
			;;
		1|3p)
			# Needed for perl(1) because Pod::Man adds the build
			# date in the man page; e.g. /usr/share/man1/pod2html.1:
			# .TH POD2HTML 1 "2017-07-29" "perl v5.24.1"
			_onm=$(mktemp)
			_nnm=$(mktemp)
			trap 'rm -f ${_onm} ${_nnm}' EXIT
			sed -E '/([0-9]+-[0-9]+-[0-9]+|=+)/d' ${_o} > ${_onm}
			sed -E '/([0-9]+-[0-9]+-[0-9]+|=+)/d' ${_n} > ${_nnm}
			diff -q ${_onm} ${_nnm} >/dev/null || padd ${_n}
			rm -f ${_onm} ${_nnm}
			;;
		EFI|dat|db|tgz|*void|*dir|mk|cache-4)
			;;
		*)
			padd ${_n}
			;;
	esac
done

sort -u ${plist}