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

Don't exit on package installation failure

Browse Source
This commit is contained in:
Bryan Roessler
2020-06-11 16:16:53 -04:00
parent 1e029fd611
commit e0a8bffe5d
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
installJRMC
View File

@@ -18,7 +18,7 @@ shopt -s extglob
#######################################
installJRMC() {
_scriptversion="0.6-dev"
_scriptversion="0.7"
_boardurl="https://yabb.jriver.com/interact/index.php/board,64.0.html"
_outputdir="$_basedir/output"
_createrepo_webroot="/srv/jriver"
@@ -392,12 +392,12 @@ EOF
echo "Installing:" "${_pkg_array[@]}"
if [[ -n $_debug ]]; then
if ! _pkg_install "${_pkg_array[@]}"; then
err "Failed to install package"
exit 1
err "Failed to install package. Attempting to continue..."
return 1
fi
elif ! _pkg_install "${_pkg_array[@]}" > /dev/null 2>&1; then
err "Failed to install package."
_printHelpAndExit 1
err "Failed to install package. Attempting to continue..."
return 1
fi
fi
@@ -406,12 +406,12 @@ EOF
echo "Installing:" "${_url_pkg_array[@]}"
if [[ -n $_debug ]]; then
if ! _pkg_install_nogpg "${_url_pkg_array[@]}"; then
err "Failed to install required package from url"
exit 1
err "Failed to install package. Attempting to continue..."
return 1
fi
elif ! _pkg_install_nogpg "${_url_pkg_array[@]}" > /dev/null 2>&1; then
err "Failed to install required package from url"
_printHelpAndExit 1
err "Failed to install package. Attempting to continue..."
return 1
fi
fi
}