bonsai/kiss
3
0
Fork 0
forked from kiss-community/kiss
Code Issues 2 Pull Requests Projects Releases Activity

kiss: make KISS_PROMPT=0 skip install entirely.

Browse Source 
Less intrusive fix for #265
This commit is contained in:
Dylan Araps 2021-08-31 17:47:41 +03:00
parent d58eb983bf
commit 252df82806
No known key found for this signature in database
GPG Key ID: 13295DAC2CF13B5C
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kiss
View File

@ -868,7 +868,6 @@ pkg_tar() {
pkg_build_all() { pkg_build_all() {
# Build packages and turn them into packaged tarballs. # Build packages and turn them into packaged tarballs.
# Order the argument list and filter out duplicates. # Order the argument list and filter out duplicates.
export KISS_BUILD_INSTALL=${KISS_BUILD_INSTALL:=1}
# Mark packages passed on the command-line explicit. # Mark packages passed on the command-line explicit.
# Also resolve dependencies for all explicit packages. # Also resolve dependencies for all explicit packages.
@ -949,7 +948,7 @@ pkg_build_all() {
pkg_etcsums pkg_etcsums
pkg_tar "$pkg" pkg_tar "$pkg"
if equ "$KISS_BUILD_INSTALL" 1 || ! contains "$explicit" "$pkg"; then if equ "${prefer_cache:=0}" 1 || ! contains "$explicit" "$pkg"; then
log "$pkg" "Needed as a dependency or has an update, installing" log "$pkg" "Needed as a dependency or has an update, installing"
# Intended behavior. # Intended behavior.
@ -958,11 +957,10 @@ pkg_build_all() {
fi fi
done done
case $KISS_BUILD_INSTALL in 1) # Intentional, globbing disabled.
# Intentional, globbing disabled. # shellcheck disable=2046,2086
# shellcheck disable=2046,2086 ! equ "${build_install:=1}" 1 || ! equ "${KISS_PROMPT:=1}" 1 ||
! prompt "Install built packages? [$explicit]" || (args i $explicit) ! prompt "Install built packages? [$explicit]" || (args i $explicit)
esac
} }
pkg_build() { pkg_build() {
@ -1676,7 +1674,7 @@ pkg_upgrade() {
war "Packages without repository$_repo_orp" war "Packages without repository$_repo_orp"
esac esac
export KISS_BUILD_INSTALL=0 build_install=0
prefer_cache=1 prefer_cache=1
! contains "$*" kiss || { ! contains "$*" kiss || {