From eff0a75f2a1571e901f82ba631ee078d50ac82cd Mon Sep 17 00:00:00 2001 From: "dylan.araps@gmail.com" Date: Sat, 29 Feb 2020 18:07:33 +0000 Subject: kiss: Remove -N from diff FossilOrigin-Name: cf68b9272f557a1cab470c9b2c04581ef3721fe2112d4b9bc0809d605282c3ef --- kiss | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/kiss b/kiss index d8ea618..821b77f 100755 --- a/kiss +++ b/kiss @@ -397,7 +397,12 @@ pkg_fixdeps() { # Make a copy of the depends file if it exists to have a # reference to 'diff' against. - [ -f depends ] && cp -f depends "$mak_dir/d" + if [ -f depends ]; then + cp -f depends "$mak_dir/d" + dep_file=$mak_dir/d + else + dep_file=/dev/null + fi # Generate a list of all installed manifests. pkg_name=$1 @@ -434,16 +439,15 @@ pkg_fixdeps() { *) printf '%s\n' "$dep" ;; esac done ||: - done | + done >> depends # Remove duplicate entries from the new depends file. # This removes duplicate lines looking *only* at the # first column. - sort -uk1,1 -o depends depends - 2>/dev/null ||: + sort -uk1,1 -o depends depends 2>/dev/null ||: - # Display a 'diff' of the new dependencies against - # the old ones. '-N' treats non-existent files as blank. - diff -N "$mak_dir/d" depends ||: + # Display a diff of the new dependencies against the old ones. + diff "$dep_file" depends 2>/dev/null ||: } pkg_manifest() ( -- cgit v1.2.3