aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormerakor <cem@ckyln.com>2020-08-11 17:17:38 +0000
committermerakor <cem@ckyln.com>2020-08-11 17:17:38 +0000
commit22405ed2c12624a6353536f6248fdb5c1e7379e5 (patch)
tree1e72579b941f0ccf64865d46b82c9284adb3eb36
parent378477e6eb108e021cf3b2acf4e5f366c56f60a6 (diff)
downloadcpt-22405ed2c12624a6353536f6248fdb5c1e7379e5.tar.gz
pkg_build: fix diff
FossilOrigin-Name: 86fe61aadd5e081c1c1915b4f90b8906e425ea02a4e91e6eb3d17151e0d3fb0a
-rw-r--r--src/cpt-lib2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cpt-lib b/src/cpt-lib
index 1d77016..7e2a0fb 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/build" .build.cpt > "$pkg_dir/$pkg/$pkg_db/build" > "$pkg_dir/$pkg/$pkg_db/build.diff"
+ diff "$pkg_dir/$pkg/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