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

Remove source RPM if build fails

Browse Source
This commit is contained in:
Bryan Roessler
2021-09-15 17:44:31 -04:00
parent 51b3281d21
commit c3dda12f35
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
installJRMC
View File

@@ -12,7 +12,7 @@ shopt -s extglob
# #
####################################### #######################################
_scriptversion="1.0.0a2" _scriptversion="1.0.0a3"
_boardurl="https://yabb.jriver.com/interact/index.php/board,71.0.html" _boardurl="https://yabb.jriver.com/interact/index.php/board,71.0.html"
_outputdir="$PWD/output" _outputdir="$PWD/output"
_createrepo_webroot="/srv/jriver" _createrepo_webroot="/srv/jriver"
@@ -562,31 +562,34 @@ _installMCFromRepo() {
####################################### #######################################
# Acquire the source DEB package from JRiver's servers # Acquire the source DEB package from JRiver's servers
# Globals:
# DEBFILENAME
# Returns: # Returns:
# 0 if DEB file downloaded successfully, 1 if failed # 0 if DEB file downloaded successfully, 1 if failed
####################################### #######################################
_acquireDeb() { _acquireDeb() {
debug "Running: ${FUNCNAME[0]}" debug "Running: ${FUNCNAME[0]}"
local _debfilename="$_outputdir/SOURCES/MediaCenter-$_mcversion-amd64.deb" declare -g DEBFILENAME
DEBFILENAME="$_outputdir/SOURCES/MediaCenter-$_mcversion-amd64.deb"
# If necessary, create SOURCES dir # If necessary, create SOURCES dir
[[ ! -d "$_outputdir/SOURCES" ]] && mkdir -p "$_outputdir/SOURCES" [[ ! -d "$_outputdir/SOURCES" ]] && mkdir -p "$_outputdir/SOURCES"
# If deb file already exists, skip download # If deb file already exists, skip download
if [[ -f "$_debfilename" ]]; then if [[ -f "$DEBFILENAME" ]]; then
echo "Using local DEB file: $_debfilename" echo "Using local DEB file: $DEBFILENAME"
elif [[ -v _betapass ]]; then elif [[ -v _betapass ]]; then
echo -n "Checking beta repo..." echo -n "Checking beta repo..."
if wget -q -O "$_debfilename" \ if wget -q -O "$DEBFILENAME" \
"https://files.jriver.com/mediacenter/channels/v$_mversion/beta/$_betapass/MediaCenter-$_mcversion-amd64.deb"; then "https://files.jriver.com/mediacenter/channels/v$_mversion/beta/$_betapass/MediaCenter-$_mcversion-amd64.deb"; then
echo "Found!" echo "Found!"
fi fi
elif echo -n "Checking test repo..." && wget -q -O "$_debfilename" \ elif echo -n "Checking test repo..." && wget -q -O "$DEBFILENAME" \
"https://files.jriver.com/mediacenter/test/MediaCenter-$_mcversion-amd64.deb"; then "https://files.jriver.com/mediacenter/test/MediaCenter-$_mcversion-amd64.deb"; then
echo "Found!" echo "Found!"
# Else check latest repo # Else check latest repo
elif echo -n "Checking latest repo..." && wget -q -O "$_debfilename" \ elif echo -n "Checking latest repo..." && wget -q -O "$DEBFILENAME" \
"https://files.jriver.com/mediacenter/channels/v$_mversion/latest/MediaCenter-$_mcversion-amd64.deb"; then "https://files.jriver.com/mediacenter/channels/v$_mversion/latest/MediaCenter-$_mcversion-amd64.deb"; then
echo "Found!" echo "Found!"
else else
@@ -594,7 +597,7 @@ _acquireDeb() {
exit 1 exit 1
fi fi
if [[ ! -f "$_debfilename" ]]; then if [[ ! -f "$DEBFILENAME" ]]; then
err "Downloaded DEB file missing or corrupted, exiting..." err "Downloaded DEB file missing or corrupted, exiting..."
exit 1 exit 1
fi fi
@@ -714,6 +717,8 @@ _buildRPM() {
# shellcheck disable=SC2181 # shellcheck disable=SC2181
if [[ $? -ne 0 || ! -f "$_mcrpm" ]]; then if [[ $? -ne 0 || ! -f "$_mcrpm" ]]; then
err "Build failed. Exiting..." err "Build failed. Exiting..."
echo "Removing source DEB"
[[ -f "$DEBFILENAME" ]] && rm -f "$DEBFILENAME"
exit 1 exit 1
else else
echo "Build successful. The RPM file is located at: $_mcrpm" echo "Build successful. The RPM file is located at: $_mcrpm"