From b44c3f34e9768201a540ac36c3a525f7effb6778 Mon Sep 17 00:00:00 2001 From: merakor Date: Wed, 12 Aug 2020 08:11:24 +0000 Subject: pkg_build(): do a unified diff FossilOrigin-Name: 08b04932f744cc72247dbab3f4c98f0ffcc86ec883fa5092459b996c64e5e4a0 --- src/cpt-lib | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/cpt-lib') 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. -- cgit v1.2.3