From 53fbb2ebdc2131c94021944195561f053ef45284 Mon Sep 17 00:00:00 2001 From: bryan Date: Tue, 20 Dec 2022 12:32:35 -0500 Subject: [PATCH] Fix package filter --- installJRMC | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/installJRMC b/installJRMC index 4810af0..ca7fcf9 100755 --- a/installJRMC +++ b/installJRMC @@ -445,21 +445,17 @@ installPackage() { ;; esac - echo "Input: $*" - # Filter installed packages - if ! (( skip_check_installed )); then - for pkg in "$@"; do - if [[ -v pkg_aliases[$pkg] ]]; then - pkg=${pkg_aliases[$pkg]} - fi - if ! (hash "$pkg" &>/dev/null || pkg_query "$pkg" &>/dev/null); then - pkg_array+=("$pkg") - else - debug "$pkg already installed, skipping installation" - fi - done - fi + for pkg in "$@"; do + if [[ -v pkg_aliases[$pkg] ]]; then + pkg=${pkg_aliases[$pkg]} + fi + if (( skip_check_installed )) || ! (hash "$pkg" &>/dev/null || pkg_query "$pkg" &>/dev/null); then + pkg_array+=("$pkg") + else + debug "$pkg already installed, skipping installation" + fi + done # Generate distro-specific install flags case "$ID" in @@ -476,8 +472,6 @@ installPackage() { ;; esac - debug "pkg_array: ${pkg_array[*]}" - # Install packages from package array if [[ ${#pkg_array[@]} -ge 1 ]]; then echo HERE