kiss: nitpicks
This commit is contained in:
parent
759dc1081a
commit
8210e660a1
11
kiss
11
kiss
|
@ -512,11 +512,11 @@ pkg_build() {
|
||||||
# Only ask for confirmation if more than one package needs to be built.
|
# Only ask for confirmation if more than one package needs to be built.
|
||||||
[ $# -gt 1 ] || [ "$pkg_update" ] && prompt
|
[ $# -gt 1 ] || [ "$pkg_update" ] && prompt
|
||||||
|
|
||||||
|
for pkg do pkg_lint "$pkg"; done
|
||||||
|
|
||||||
log "Checking to see if any dependencies have already been built"
|
log "Checking to see if any dependencies have already been built"
|
||||||
log "Installing any pre-built dependencies"
|
log "Installing any pre-built dependencies"
|
||||||
|
|
||||||
for pkg do pkg_lint "$pkg"; done
|
|
||||||
|
|
||||||
# Install any pre-built dependencies if they exist in the binary
|
# Install any pre-built dependencies if they exist in the binary
|
||||||
# directory and are up to date.
|
# directory and are up to date.
|
||||||
for pkg do ! contains "$explicit_build" "$pkg" && pkg_cache "$pkg" && {
|
for pkg do ! contains "$explicit_build" "$pkg" && pkg_cache "$pkg" && {
|
||||||
|
@ -543,13 +543,9 @@ pkg_build() {
|
||||||
|
|
||||||
# Install built packages to a directory under the package name
|
# Install built packages to a directory under the package name
|
||||||
# to avoid collisions with other packages.
|
# to avoid collisions with other packages.
|
||||||
mkdir -p "$pkg_dir/$pkg/$pkg_db"
|
mkdir -p "$pkg_dir/$pkg/$pkg_db" && cd "$mak_dir/$pkg"
|
||||||
|
|
||||||
# Move to the build directory.
|
|
||||||
cd "$mak_dir/$pkg"
|
|
||||||
|
|
||||||
log "$pkg" "Starting build"
|
log "$pkg" "Starting build"
|
||||||
|
|
||||||
run_hook pre-build "$pkg" "$pkg_dir/$pkg"
|
run_hook pre-build "$pkg" "$pkg_dir/$pkg"
|
||||||
|
|
||||||
# Call the build script, log the output to the terminal
|
# Call the build script, log the output to the terminal
|
||||||
|
@ -577,7 +573,6 @@ pkg_build() {
|
||||||
rm -f "$pkg_dir/$pkg/usr/lib/charset.alias"
|
rm -f "$pkg_dir/$pkg/usr/lib/charset.alias"
|
||||||
|
|
||||||
log "$pkg" "Successfully built package"
|
log "$pkg" "Successfully built package"
|
||||||
|
|
||||||
run_hook post-build "$pkg" "$pkg_dir/$pkg"
|
run_hook post-build "$pkg" "$pkg_dir/$pkg"
|
||||||
|
|
||||||
# Create the manifest file early and make it empty.
|
# Create the manifest file early and make it empty.
|
||||||
|
|
Loading…
Reference in New Issue