bryan/installJRMC
1
0
Fork 0
Code Issues Pull Requests Releases 8 Wiki Activity

Fix package filter

Browse Source
This commit is contained in:
Bryan Roessler
2022-12-20 12:32:35 -05:00
parent fc13233b46
commit 53fbb2ebdc
1 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
installJRMC
View File

@@ -445,21 +445,17 @@ installPackage() {
;; ;;
esac esac
echo "Input: $*"
# Filter installed packages # Filter installed packages
if ! (( skip_check_installed )); then
for pkg in "$@"; do for pkg in "$@"; do
if [[ -v pkg_aliases[$pkg] ]]; then if [[ -v pkg_aliases[$pkg] ]]; then
pkg=${pkg_aliases[$pkg]} pkg=${pkg_aliases[$pkg]}
fi fi
if ! (hash "$pkg" &>/dev/null || pkg_query "$pkg" &>/dev/null); then if (( skip_check_installed )) || ! (hash "$pkg" &>/dev/null || pkg_query "$pkg" &>/dev/null); then
pkg_array+=("$pkg") pkg_array+=("$pkg")
else else
debug "$pkg already installed, skipping installation" debug "$pkg already installed, skipping installation"
fi fi
done done
fi
# Generate distro-specific install flags # Generate distro-specific install flags
case "$ID" in case "$ID" in
@@ -476,8 +472,6 @@ installPackage() {
;; ;;
esac esac
debug "pkg_array: ${pkg_array[*]}"
# Install packages from package array # Install packages from package array
if [[ ${#pkg_array[@]} -ge 1 ]]; then if [[ ${#pkg_array[@]} -ge 1 ]]; then
echo HERE echo HERE