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

Append ARM arch to package name and version

Browse Source
This commit is contained in:
Bryan Roessler
2026-07-19 16:34:26 -04:00
parent 0643189803
commit 4ffa58727f
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.README.bbcode
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. "36.0.14" or "35" (default: latest release). Specify the MC version, ex. "36.0.20" 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 36.0.14[/code] [code]installJRMC --install local --compat --restorefile /path/to/license.mjr --mcversion 36.0.20[/code]
Build and install an MC 36.0.14 comptability RPM locally and activate it using the [tt]/path/to/license.mjr[/tt]. Build and install an MC 36.0.20 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]

6
README.md
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. "36.0.14" or "35" (default: latest release). Specify the MC version, ex. "36.0.20" 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 36.0.14` * `installJRMC --install local --compat --restorefile /path/to/license.mjr --mcversion 36.0.20`
Build and install an MC 36.0.14 compatibility RPM locally and activate it using the `/path/to/license.mjr`. Build and install an MC 36.0.20 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`

13
installJRMC
View File

@@ -23,7 +23,7 @@
shopt -s extglob shopt -s extglob
declare -g SCRIPT_VERSION="1.36.1-dev" declare -g SCRIPT_VERSION="1.36.1-dev"
declare -g MC_VERSION_HARDCODE="36.0.14" # do find all replace declare -g MC_VERSION_HARDCODE="36.0.20" # 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="95.0" # MC36 board ID for fallback latest version detection declare -g BOARD_ID="95.0" # MC36 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
@@ -440,7 +440,14 @@ 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|mandriva) MC_PKG+="-$MC_VERSION" ;; fedora|centos|suse|mandriva) MC_PKG+="-$MC_VERSION" ;;
debian|ubuntu) MC_PKG+="=$MC_VERSION" ;; debian|ubuntu)
# ARM packages append arch to the package name and version
if [[ $MC_ARCH == "arm64" || $MC_ARCH == "armhf" ]]; then
MC_PKG+=":${MC_ARCH}=${MC_VERSION}-${MC_ARCH}"
else
MC_PKG+="=$MC_VERSION"
fi
;;
esac esac
fi fi
} }
@@ -2240,7 +2247,7 @@ create_mc_apt_container() {
Signed-By: /usr/share/keyrings/jriver-com-archive-keyring.gpg Signed-By: /usr/share/keyrings/jriver-com-archive-keyring.gpg
Suites: $MC_REPO Suites: $MC_REPO
Components: main Components: main
Architectures: $MC_ARCH Architectures: amd64 armhf arm64
EOF EOF
apt-get update -qq' && apt-get update -qq' &&
# If user passes command strings run them in the container # If user passes command strings run them in the container