aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormerakor <cem@ckyln.com>2020-08-11 17:41:06 +0000
committermerakor <cem@ckyln.com>2020-08-11 17:41:06 +0000
commit8ab384c52333be27a1c1f48a9bfc959bd6341bcd (patch)
tree1ed98af6716ad1c2da876b87669a161c0986c7b4
parent22405ed2c12624a6353536f6248fdb5c1e7379e5 (diff)
downloadcpt-8ab384c52333be27a1c1f48a9bfc959bd6341bcd.tar.gz
holy hell I think this actually fixes the diff :)
FossilOrigin-Name: 9bf95a4c93872048bccd33a9056d11c98958e724a5423e264fb1779e5a3df81c
-rw-r--r--src/cpt-lib2
1 files changed, 1 insertions, 1 deletions
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