aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormerakor <cem@ckyln.com>2020-08-12 08:11:24 +0000
committermerakor <cem@ckyln.com>2020-08-12 08:11:24 +0000
commitb44c3f34e9768201a540ac36c3a525f7effb6778 (patch)
tree822a4a08fc5702021ab49b95daf461db65bff9f1
parente21bcf28b20fd2d6fcd9e076c9d805229e685b6f (diff)
downloadcpt-b44c3f34e9768201a540ac36c3a525f7effb6778.tar.gz
pkg_build(): do a unified diff
FossilOrigin-Name: 08b04932f744cc72247dbab3f4c98f0ffcc86ec883fa5092459b996c64e5e4a0
-rw-r--r--src/cpt-lib5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/cpt-lib b/src/cpt-lib
index bbb398d..bc8f0ff 100644
--- a/src/cpt-lib
+++ b/src/cpt-lib
@@ -752,8 +752,9 @@ pkg_build() {
cp -LRf "$repo_dir" "$pkg_dir/$pkg/$pkg_db/"
# Copy the modified build file to the package directory.
- diff "$pkg_dir/$pkg/$pkg_db/$pkg/build" .build.cpt > "$pkg_dir/$pkg/$pkg_db/$pkg/build.diff" &&
- rm -f "$pkg_dir/$pkg/$pkg_db/$pkg/build.diff"
+ pkg_build="$pkg_dir/$pkg/$pkg_db/$pkg/build"
+ diff -U 3 "$pkg_build" .build.cpt > "$pkg_build.diff" &&
+ rm -f "$pkg_build.diff"
# We never ever want this. Let's end the endless conflicts
# and remove it.