Formatting and sanity check
This commit is contained in:
11
installJRMC
11
installJRMC
@@ -415,16 +415,16 @@ acquireDeb() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -v BETAPASS ]]; then
|
if [[ -v BETAPASS ]]; then
|
||||||
echo "Checking beta repo..."
|
echo "Checking beta repo for DEB package"
|
||||||
if wget -q -O "$MCDEB" \
|
if wget -q -O "$MCDEB" \
|
||||||
"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 "Checking test repo..." && wget -q -O "$MCDEB" \
|
elif echo "Checking test repo for DEB package" && wget -q -O "$MCDEB" \
|
||||||
"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 "Checking latest repo..." && wget -q -O "$MCDEB" \
|
elif echo "Checking latest repo for DEB package" && wget -q -O "$MCDEB" \
|
||||||
"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
|
||||||
@@ -460,6 +460,11 @@ buildRPM() {
|
|||||||
|
|
||||||
# Use --target parameter override
|
# Use --target parameter override
|
||||||
id="${TARGET:-$ID}"
|
id="${TARGET:-$ID}"
|
||||||
|
if [[ ! "$id" =~ (fedora|centos|opensuse.*) ]]; then
|
||||||
|
err "The current RPM build target $id is not supported, manually specify with --target"
|
||||||
|
err "The DEB file is located at $MCDEB"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
# Load deb dependencies into array
|
# Load deb dependencies into array
|
||||||
IFS=',' read -ra requires <<< "$(dpkg-deb -f "$MCDEB" Depends)"
|
IFS=',' read -ra requires <<< "$(dpkg-deb -f "$MCDEB" Depends)"
|
||||||
|
|||||||
Reference in New Issue
Block a user