From 945f667f619272ce50ab7cb3676874587eeb870c Mon Sep 17 00:00:00 2001 From: merakor Date: Tue, 11 Aug 2020 12:19:54 +0000 Subject: pkg_build(): use .build.cpt so that the build files can be modified Change originally on `kiss` by Dylan Araps FossilOrigin-Name: 36b6acd745cc6d542c7e4e70e7fe19b421541ac8392ac9baa7db0c2be3ff6ad4 --- src/cpt-lib | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/cpt-lib b/src/cpt-lib index de17cc4..092a515 100644 --- a/src/cpt-lib +++ b/src/cpt-lib @@ -717,6 +717,10 @@ pkg_build() { read -r build_version _ < "$repo_dir/version" + # Copy the build file to the build directory to users to modify it + # temporarily at runtime. + cp -f "$repo_dir/build" "$mak_dir/$pkg/.build.cpt" + # Install built packages to a directory under the package name # to avoid collisions with other packages. mkdir -p "$pkg_dir/$pkg/$pkg_db" @@ -731,7 +735,7 @@ pkg_build() { # Call the build script, log the output to the terminal # and to a file. There's no PIPEFAIL in POSIX shelll so # we must resort to tricks like killing the script ourselves. - { "$repo_dir/build" "$pkg_dir/$pkg" "$build_version" "$sys_arch" 2>&1 || { + { ./.build.cpt "$pkg_dir/$pkg" "$build_version" "$sys_arch" 2>&1 || { log "$pkg" "Build failed" log "$pkg" "Log stored to $log_dir/$pkg-$time-$pid" run_hook build-fail "$pkg" "$pkg_dir/$pkg" -- cgit v1.2.3