cpt

Carbs Packaging Tools
git clone git://git.carbslinux.org/cpt
Log | Files | Refs | README | LICENSE

commit f073c4d4534af760b2b585ee665bf3c396a7b16b
parent fb4da0e961d64886618bd7b920ef2e9c5fcc6eb3
Author: Cem Keylan <cem@ckyln.com>
Date:   Wed, 12 Aug 2020 11:11:25 +0300

pkg_build(): do a unified diff

Diffstat:
Msrc/cpt-lib | 5+++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git 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.