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

Allow release specifiers for DEB

Browse Source
This commit is contained in:
Bryan Roessler
2025-04-12 10:15:16 -04:00
parent 23514ea85a
commit fd3f28367e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
installJRMC
View File

@@ -237,7 +237,7 @@ init() {
declare -g CREATEREPO_WEBROOT="/var/www/jriver" declare -g CREATEREPO_WEBROOT="/var/www/jriver"
declare -g CREATEREPO_USER="$USER" # can be root declare -g CREATEREPO_USER="$USER" # can be root
declare -g ID VERSION_ID ARCH NAME declare -g ID VERSION_ID ARCH NAME
declare -g MC_MVERSION MC_PKG MC_RPM MC_ROOT declare -g MC_MVERSION MC_RELEASE MC_PKG MC_RPM MC_ROOT
declare -ga PKG_INSTALL PKG_REMOVE PKG_UPDATE PKG_QUERY declare -ga PKG_INSTALL PKG_REMOVE PKG_UPDATE PKG_QUERY
declare -ga SERVICES CONTAINERS declare -ga SERVICES CONTAINERS
@@ -392,6 +392,7 @@ init() {
# Set MC version variables # Set MC version variables
MC_REPO="${USER_MC_REPO:-$MC_REPO}" MC_REPO="${USER_MC_REPO:-$MC_REPO}"
MC_VERSION="${USER_MC_VERSION:-$MC_VERSION}" MC_VERSION="${USER_MC_VERSION:-$MC_VERSION}"
MC_RELEASE="${USER_MC_RELEASE:-1}"
MC_MVERSION="${MC_VERSION%%.*}" MC_MVERSION="${MC_VERSION%%.*}"
MC_PKG="mediacenter$MC_MVERSION" MC_PKG="mediacenter$MC_MVERSION"
# The release number isn't used in the rpmbuild spec file # The release number isn't used in the rpmbuild spec file
@@ -402,7 +403,7 @@ init() {
# Append explicit package version when user provides --mcversion # Append explicit package version when user provides --mcversion
case $ID in case $ID in
fedora|centos|suse) MC_PKG+="-$MC_VERSION" ;; fedora|centos|suse) MC_PKG+="-$MC_VERSION" ;;
debian|ubuntu) MC_PKG+="=$MC_VERSION" ;; debian|ubuntu) MC_PKG+="=$MC_VERSION-$MC_RELEASE" ;;
esac esac
fi fi
@@ -843,7 +844,7 @@ build_rpm() {
cat <<-EOF > "$OUTPUT_DIR/SPECS/mediacenter.spec" cat <<-EOF > "$OUTPUT_DIR/SPECS/mediacenter.spec"
Name: mediacenter$MC_MVERSION Name: mediacenter$MC_MVERSION
Version: ${MC_VERSION%%-*} Version: ${MC_VERSION%%-*}
Release: ${USER_MC_RELEASE:-1} Release: $MC_RELEASE
Summary: JRiver Media Center Summary: JRiver Media Center
Group: Applications/Media Group: Applications/Media
Source0: http://files.jriver-cdn.com/mediacenter/channels/v$MC_MVERSION/latest/MediaCenter-$MC_VERSION-$ARCH.deb Source0: http://files.jriver-cdn.com/mediacenter/channels/v$MC_MVERSION/latest/MediaCenter-$MC_VERSION-$ARCH.deb
@@ -896,7 +897,6 @@ build_rpm() {
-bb -bb
"$OUTPUT_DIR/SPECS/mediacenter.spec" "$OUTPUT_DIR/SPECS/mediacenter.spec"
) )
declare -p
if execute "${rpmbuild_cmd[@]}" && [[ -f ${MC_RPM} ]] ; then if execute "${rpmbuild_cmd[@]}" && [[ -f ${MC_RPM} ]] ; then
echo "Build successful. The RPM file is located at: $MC_RPM" echo "Build successful. The RPM file is located at: $MC_RPM"
else else