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

Merge branch 'dev'

Browse Source
This commit is contained in:
Bryan Roessler
2024-01-19 14:42:09 -05:00
parent b064dbe92c 447683a201
commit 9702ddc7a5
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@@ -23,7 +23,7 @@ $ installJRMC --help
--compat
Build/install MC without minimum dependency version requirements
--mcversion VERSION
Build or install a specific MC version, ex. "31.0.43" (default: latest version)
Build or install a specific MC version, ex. "32.0.6" (default: latest version)
--arch ARCH
Specify the MC architecture, ex. "amd64", "arm64", etc (default: host architecture)
--outputdir PATH
@@ -112,9 +112,9 @@ Multiple services (but not `--service-types`) can be installed at one time using
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 31.0.43`
* `installJRMC --install local --compat --restorefile /path/to/license.mjr --mcversion 32.0.6`
Build and install an MC 31.0.43 comptability RPM locally and activate it using the `/path/to/license.mjr`
Build and install an MC 32.0.6 comptability RPM locally and activate it using the `/path/to/license.mjr`
* `installJRMC --createrepo --createrepo-webroot /srv/jriver/repo --createrepo-user www-user`

11
installJRMC
View File

@@ -16,10 +16,10 @@
shopt -s extglob
declare -g SCRIPTVERSION="1.0-rc11"
declare -g BOARDURL="https://yabb.jriver.com/interact/index.php/board,80.0.html" # MC31
declare -g SCRIPTVERSION="1.0"
declare -g BOARDURL="https://yabb.jriver.com/interact/index.php/board,83.0.html" # MC32
declare -g DEBIANBASE="bullseye"
declare -g MC_VERSION_HARDCODE="31.0.43" # Do find all replace
declare -g MC_VERSION_HARDCODE="32.0.6" # Do find all replace
printHelp() {
debug "Running: ${FUNCNAME[0]}"
@@ -133,6 +133,8 @@ init() {
echo "Starting installJRMC"
(( DEBUG )) || echo "To enable debugging output, use --debug or -d"
(( EUID == 0 )) && err "Running as root user"
if [[ -e /etc/os-release ]]; then
source "/etc/os-release"
else
@@ -751,6 +753,7 @@ buildRPM() {
requires=("${requires[@]/libvulkan1/vulkan-loader}")
requires=("${requires[@]/libepoxy0/libepoxy}")
requires=("${requires[@]/python/python3}")
requires=("${requires[@]/libwebkit2gtk/webkit2gtk4.0}")
recommends+=(mesa-va-drivers-freeworld)
;;
suse)
@@ -913,7 +916,7 @@ installMCGENERIC() {
declare -a raw_files
echo "Using raw installation method!"
echo "Using generic installation method!"
declare extract_dir && extract_dir="$(mktemp -d)"
pushd "$extract_dir" &>/dev/null || return