From 8ab384c52333be27a1c1f48a9bfc959bd6341bcd Mon Sep 17 00:00:00 2001 From: merakor Date: Tue, 11 Aug 2020 17:41:06 +0000 Subject: holy hell I think this actually fixes the diff :) FossilOrigin-Name: 9bf95a4c93872048bccd33a9056d11c98958e724a5423e264fb1779e5a3df81c --- src/cpt-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cpt-lib b/src/cpt-lib index 7e2a0fb..50d8daf 100644 --- a/src/cpt-lib +++ b/src/cpt-lib @@ -752,7 +752,7 @@ pkg_build() { cp -LRf "$repo_dir" "$pkg_dir/$pkg/$pkg_db/" # Copy the modified build file to the package directory. - diff "$pkg_dir/$pkg/build" .build.cpt > "$pkg_dir/$pkg/$pkg_db/build" > "$pkg_dir/$pkg/$pkg_db/build.diff" + diff "$pkg_dir/$pkg/$pkg_db/build" .build.cpt > "$pkg_dir/$pkg/$pkg_db/build" > "$pkg_dir/$pkg/$pkg_db/build.diff" [ -s "$pkg_dir/$pkg/$pkg_db/build.diff" ] || rm -f "$pkg_dir/$pkg/$pkg_db/build.diff" # We never ever want this. Let's end the endless conflicts -- cgit v1.2.3