1
0
mirror of https://codeberg.org/kiss-community/kiss synced 2024-11-04 05:55:36 -07:00

kiss: fix KISS_FORCE not working for removal

This commit is contained in:
Dylan Araps 2020-10-01 12:32:09 +03:00
parent 38e81b6920
commit 0ded2753c2
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E

10
kiss
View File

@ -644,7 +644,7 @@ pkg_build() {
# False positive. # False positive.
# shellcheck disable=2030 # shellcheck disable=2030
( (
KISS_FORCE=1 export KISS_FORCE=1
args i "$tar_file" args i "$tar_file"
) )
@ -732,8 +732,8 @@ pkg_build() {
log "$pkg" "marked for install" log "$pkg" "marked for install"
# False positive. # False positive.
# shellcheck disable=2030 # shellcheck disable=2030,2031
KISS_FORCE=1 export KISS_FORCE=1
args i "$pkg" args i "$pkg"
) )
done done
@ -1080,9 +1080,9 @@ pkg_remove() {
[ "$KISS_FORCE" = 1 ] || ( [ "$KISS_FORCE" = 1 ] || (
cd "$sys_db" cd "$sys_db"
set +f set +f
grep -lFx "$1" -- */depends ! grep -lFx "$1" -- */depends
) && die "$1" "can't remove package, others depend on it" ) || die "$1" "can't remove package, others depend on it"
# Block being able to abort the script with 'Ctrl+C' during removal. # Block being able to abort the script with 'Ctrl+C' during removal.
# Removes all risk of the user aborting a package removal leaving an # Removes all risk of the user aborting a package removal leaving an