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

Fix local RPM install

Browse Source
This commit is contained in:
Bryan Roessler
2021-12-03 12:59:17 -05:00
parent d6e9ec6501
commit 73759e6a7f
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
installJRMC
View File

@@ -402,7 +402,7 @@ getLatestVersion() {
# Arguments: # Arguments:
# One or more package names # One or more package names
# Options: # Options:
# --no-check: Do not check if package is already installed # --nocheck: Do not check if package is already installed
# --nogpgcheck: Disable GPG checks for RPM based distros # --nogpgcheck: Disable GPG checks for RPM based distros
# --silent, -s: Do not report errors (useful if package is not strictly required and errors are noisy) # --silent, -s: Do not report errors (useful if package is not strictly required and errors are noisy)
####################################### #######################################
@@ -410,14 +410,14 @@ installPackage() {
debug "Running: ${FUNCNAME[0]}" "$@" debug "Running: ${FUNCNAME[0]}" "$@"
local -a _pkg_array _install_flags local -a _pkg_array _install_flags
local _pkg local _pkg _nocheck _silent _return
if _input=$(getopt -o +s -l no-check,nogpgcheck,silent -- "$@"); then if _input=$(getopt -o +s -l no-check,nogpgcheck,silent -- "$@"); then
eval set -- "$_input" eval set -- "$_input"
while true; do while true; do
case "$1" in case "$1" in
--no-check) --nocheck)
local _no_check=true _nocheck=true
;; ;;
--nogpgcheck) --nogpgcheck)
if [[ "$ID" =~ ^(fedora|centos)$ ]]; then if [[ "$ID" =~ ^(fedora|centos)$ ]]; then
@@ -427,7 +427,7 @@ installPackage() {
fi fi
;; ;;
--silent|-s) --silent|-s)
local _silent=true _silent=true
;; ;;
--) --)
shift shift
@@ -443,7 +443,7 @@ installPackage() {
for _pkg in "$@"; do for _pkg in "$@"; do
# Check for alias # Check for alias
if [[ -v PKG_ALIASES["$_pkg"] ]]; then if [[ ! -v _nocheck && -v PKG_ALIASES[$_pkg] ]]; then
_pkg=${PKG_ALIASES[$_pkg]} _pkg=${PKG_ALIASES[$_pkg]}
fi fi
# Check if already installed # Check if already installed
@@ -461,7 +461,7 @@ installPackage() {
else else
pkg_install "${_install_flags[@]}" "${_pkg_array[@]}" > /dev/null 2>&1 pkg_install "${_install_flags[@]}" "${_pkg_array[@]}" > /dev/null 2>&1
fi fi
local _return=$? _return=$?
[[ $_return -ne 0 && ! -v _silent ]] && err "Failed to install ${_pkg_array[*]}. Attempting to continue..." [[ $_return -ne 0 && ! -v _silent ]] && err "Failed to install ${_pkg_array[*]}. Attempting to continue..."
return $_return return $_return
fi fi
@@ -532,10 +532,10 @@ installMCFromRepo() {
fi fi
if debug; then if debug; then
debug "installPackage --no-check $_mcpkg" debug "installPackage --nocheck $_mcpkg"
installPackage --no-check --nogpgcheck "$_mcpkg" installPackage --nocheck --nogpgcheck "$_mcpkg"
else else
installPackage --no-check --nogpgcheck "$_mcpkg" > /dev/null 2>&1 installPackage --nocheck --nogpgcheck "$_mcpkg" > /dev/null 2>&1
fi fi
return $? return $?
@@ -1337,7 +1337,7 @@ main() {
# Install RPM # Install RPM
if [[ -v _install && "$_install" == "rpm" ]]; then if [[ -v _install && "$_install" == "rpm" ]]; then
installPackage --no-check --nogpgcheck "$_mcrpm" installPackage --nocheck --nogpgcheck "$_mcrpm"
symlinkCerts symlinkCerts
restoreLicense restoreLicense
openFirewall "jriver" openFirewall "jriver"