From 0fb84cccec7a83587f24a5e7e888bc576bcd109b Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 25 Mar 2020 17:14:44 +0200 Subject: [PATCH] kiss: Clean up --- kiss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kiss b/kiss index 4f5f95d..e6cf44d 100755 --- a/kiss +++ b/kiss @@ -690,14 +690,14 @@ pkg_conflicts() { "${file##*/}" done < "$tar_dir/$1/$sys_db/$1/manifest" > "$cac_dir/$pid-m" + [ -s "$cac_dir/$pid-m" ] || return 0 + p_name=$1 # Generate a list of all installed package manifests # and remove the current package from the list. # shellcheck disable=2046,2086 - set -- $(set +f; pop "$sys_db/$p_name/manifest" from "$sys_db"/*/manifest) - - [ -s "$cac_dir/$pid-m" ] || return 0 + set -- $(set +f; pop "$sys_db/$1/manifest" from "$sys_db"/*/manifest) # Enable alternatives automatically if it is safe to do so. # This checks to see that the package that is about to be installed