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

Remove redundant check

Browse Source
This commit is contained in:
Bryan Roessler
2022-12-20 12:09:35 -05:00
parent fe794e874f
commit aabd17db9a
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
installJRMC
View File

@@ -405,7 +405,7 @@ installPackage() {
declare pkg skip_check_installed silent pkg_install_cmd refresh allow_downgrades no_gpg_check declare pkg skip_check_installed silent pkg_install_cmd refresh allow_downgrades no_gpg_check
declare -A pkg_aliases declare -A pkg_aliases
if _input=$(getopt -o +s -l skip-check-installed,allow-downgrades,nogpgcheck,repo,refresh,silent -- "$@"); then if _input=$(getopt -o +s -l skip-check-installed,allow-downgrades,nogpgcheck,refresh,silent -- "$@"); then
eval set -- "$_input" eval set -- "$_input"
while true; do while true; do
case "$1" in case "$1" in
@@ -443,14 +443,12 @@ installPackage() {
pkg_aliases["createrepo_c"]="createrepo" pkg_aliases["createrepo_c"]="createrepo"
pkg_aliases["tigervnc-server"]="tigervnc-standalone-server" pkg_aliases["tigervnc-server"]="tigervnc-standalone-server"
;; ;;
fedora|centos)
;;
esac esac
# Filter installed packages # Filter installed packages
if ! (( skip_check_installed )); then if ! (( skip_check_installed )); then
for pkg in "$@"; do for pkg in "$@"; do
if [[ ! -v skip_check_installed && -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 ! (hash "$pkg" &>/dev/null || pkg_query "$pkg" &>/dev/null); then
@@ -475,7 +473,6 @@ installPackage() {
(( no_gpg_check )) && install_flags+=(--allow-unsigned-rpm) (( no_gpg_check )) && install_flags+=(--allow-unsigned-rpm)
esac esac
# Install packages from package array # Install packages from package array
if [[ ${#pkg_array[@]} -ge 1 ]]; then if [[ ${#pkg_array[@]} -ge 1 ]]; then
pkg_install_cmd="pkg_install ${install_flags[*]} ${pkg_array[*]}" pkg_install_cmd="pkg_install ${install_flags[*]} ${pkg_array[*]}"