2 Commits

Author SHA1 Message Date
791b0c29ab Bump MC version hardcode 2026-06-18 18:55:45 -04:00
af2e748efd Use RHEL 9 compatibility packages 2026-06-18 18:54:55 -04:00
3 changed files with 20 additions and 8 deletions

View File

@@ -27,7 +27,7 @@ $ installJRMC --help
--compat --compat
Build/install MC locally without minimum dependency version requirements. Build/install MC locally without minimum dependency version requirements.
--mcversion VERSION --mcversion VERSION
Specify the MC version, ex. "35.0.74" or "35" (default: latest release). Specify the MC version, ex. "35.0.78" or "35" (default: latest release).
--arch ARCH --arch ARCH
Specify the target MC architecture, ex. "amd64", "arm64", etc (default: host). Specify the target MC architecture, ex. "amd64", "arm64", etc (default: host).
--mcrepo REPO --mcrepo REPO
@@ -128,8 +128,8 @@ Install the latest version of MC33 from the best available repository with debug
Install a more widely-compatible version of the latest MC version. Install a more widely-compatible version of the latest MC version.
[code]installJRMC --install repo --service jriver-mediacenter --service-type user[/code] [code]installJRMC --install repo --service jriver-mediacenter --service-type user[/code]
Install MC from the repository and start/enable jriver-mediacenter.service as a user service. Install MC from the repository and start/enable jriver-mediacenter.service as a user service.
[code]installJRMC --install local --compat --restorefile /path/to/license.mjr --mcversion 35.0.74[/code] [code]installJRMC --install local --compat --restorefile /path/to/license.mjr --mcversion 35.0.78[/code]
Build and install an MC 35.0.74 comptability RPM locally and activate it using the [tt]/path/to/license.mjr[/tt]. Build and install an MC 35.0.78 comptability RPM locally and activate it using the [tt]/path/to/license.mjr[/tt].
[code]installJRMC --createrepo --createrepo-webroot /srv/jriver/repo --webroot-user www-user[/code] [code]installJRMC --createrepo --createrepo-webroot /srv/jriver/repo --webroot-user www-user[/code]
Build an RPM locally for the current distro, move it to the webroot, and run createrepo as www-user. Build an RPM locally for the current distro, move it to the webroot, and run createrepo as www-user.
[code]installJRMC --service jriver-createrepo --createrepo-webroot /srv/jriver/repo --webroot-user www-user[/code] [code]installJRMC --service jriver-createrepo --createrepo-webroot /srv/jriver/repo --webroot-user www-user[/code]

View File

@@ -28,7 +28,7 @@ OPTIONS
--compat --compat
Build/install MC locally without minimum dependency version requirements. Build/install MC locally without minimum dependency version requirements.
--mcversion VERSION --mcversion VERSION
Specify the MC version, ex. "35.0.74" or "35" (default: latest release). Specify the MC version, ex. "35.0.78" or "35" (default: latest release).
--arch VERSION --arch VERSION
Specify the target MC architecture, ex. "amd64", "arm64", etc (default: host). Specify the target MC architecture, ex. "amd64", "arm64", etc (default: host).
--mcrepo REPO --mcrepo REPO
@@ -143,9 +143,9 @@ Multiple services (but not `--service-types`) can be installed using multiple `-
Install MC from the repository and start/enable `jriver-mediacenter.service` as a user service. Install MC from the repository and start/enable `jriver-mediacenter.service` as a user service.
* `installJRMC --install local --compat --restorefile /path/to/license.mjr --mcversion 35.0.74` * `installJRMC --install local --compat --restorefile /path/to/license.mjr --mcversion 35.0.78`
Build and install an MC 35.0.74 compatibility RPM locally and activate it using the `/path/to/license.mjr`. Build and install an MC 35.0.78 compatibility RPM locally and activate it using the `/path/to/license.mjr`.
* `installJRMC --createrepo --createrepo-webroot /srv/jriver/repo --webroot-user www-user` * `installJRMC --createrepo --createrepo-webroot /srv/jriver/repo --webroot-user www-user`

View File

@@ -22,8 +22,8 @@
# shellcheck disable=SC2329 # shellcheck disable=SC2329
shopt -s extglob shopt -s extglob
declare -g SCRIPT_VERSION="1.35.16" declare -g SCRIPT_VERSION="1.35.17-dev"
declare -g MC_VERSION_HARDCODE="35.0.74" # do find all replace declare -g MC_VERSION_HARDCODE="35.0.78" # do find all replace
declare -g MC_REPO_HARDCODE="bookworm" # should match the MC_VERSION_HARDCODE declare -g MC_REPO_HARDCODE="bookworm" # should match the MC_VERSION_HARDCODE
declare -g BOARD_ID="92.0" # MC35 board ID for fallback latest version detection declare -g BOARD_ID="92.0" # MC35 board ID for fallback latest version detection
declare -gi SELF_UPDATE_SWITCH=1 # 0 to disable installJRMC self-update declare -gi SELF_UPDATE_SWITCH=1 # 0 to disable installJRMC self-update
@@ -902,6 +902,18 @@ translate_packages() {
;; ;;
*) echo "Skipping package translations for $ID" ;; *) echo "Skipping package translations for $ID" ;;
esac esac
# TODO Quirks
case $BUILD_TARGET in
# RHEL 9
centos)
if [[ ${VERSION_ID%%.*} == 9 ]]; then
requires_arr=("${requires_arr[@]/freetype*/freetype}") # remove freetype minimum version requirement
requires_arr=("${requires_arr[@]/webkit2gtk*/webkit2gtk3}") # use webkit2gtk3
requires_arr=("${requires_arr[@]/pango*/pango}") # remove pango minimum version requirement
fi
;;
esac
} }
# @description Creates an RPM .spec file and builds the RPM from the source DEB using rpmbuild # @description Creates an RPM .spec file and builds the RPM from the source DEB using rpmbuild