aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordylan.araps@gmail.com <dylan.araps@gmail.com>2020-02-29 18:07:33 +0000
committerdylan.araps@gmail.com <dylan.araps@gmail.com>2020-02-29 18:07:33 +0000
commiteff0a75f2a1571e901f82ba631ee078d50ac82cd (patch)
tree06631643d245d0109518dfe9e1a785485f8bda61
parent3d4174d4c01d2235ae8735f781a2a232d9e47707 (diff)
downloadcpt-eff0a75f2a1571e901f82ba631ee078d50ac82cd.tar.gz
kiss: Remove -N from diff
FossilOrigin-Name: cf68b9272f557a1cab470c9b2c04581ef3721fe2112d4b9bc0809d605282c3ef
-rwxr-xr-xkiss16
1 files 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() (