From cfa65519e79e041793b5bc37999fad87e0892d32 Mon Sep 17 00:00:00 2001 From: merakor Date: Tue, 11 Aug 2020 17:44:47 +0000 Subject: pkg_build(): remove the diff file if it is empty FossilOrigin-Name: e418cc6bfbace64b77a907de42afe9afc442c3c91846314fbe7e794964cc9640 --- src/cpt-lib | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/cpt-lib') diff --git a/src/cpt-lib b/src/cpt-lib index 0fe3d92..69ebc8e 100644 --- a/src/cpt-lib +++ b/src/cpt-lib @@ -752,8 +752,8 @@ 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/build" .build.cpt > "$pkg_dir/$pkg/$pkg_db/build.diff" - [ -s "$pkg_dir/$pkg/$pkg_db/build.diff" ] || rm -f "$pkg_dir/$pkg/$pkg_db/build.diff" + diff "$pkg_dir/$pkg/$pkg_db/build" .build.cpt > "$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 # and remove it. -- cgit v1.2.3