Additional prep for MC30

This commit is contained in:
2022-10-10 16:16:44 -04:00
parent d64645444e
commit a9ddaf5427
2 changed files with 6 additions and 6 deletions

View File

@@ -23,7 +23,7 @@ $ installJRMC --help
--compat --compat
Build/install MC without minimum library specifiers Build/install MC without minimum library specifiers
--mcversion VERSION --mcversion VERSION
Build or install a specific MC version, ex. "29.0.18" Build or install a specific MC version, ex. "30.0.17"
--outputdir PATH --outputdir PATH
Generate rpmbuild output in this PATH (Default: ./output) Generate rpmbuild output in this PATH (Default: ./output)
--restorefile RESTOREFILE --restorefile RESTOREFILE
@@ -110,9 +110,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. 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 29.0.18` * `installJRMC --install local --compat --restorefile /path/to/license.mjr --mcversion 30.0.17`
Build and install an MC 29.0.18 comptability RPM locally and activate it using the `/path/to/license.mjr` Build and install an MC 30.0.17 comptability RPM locally and activate it using the `/path/to/license.mjr`
* `installJRMC --createrepo --createrepo-webroot /srv/jriver/repo --createrepo-user www-user` * `installJRMC --createrepo --createrepo-webroot /srv/jriver/repo --createrepo-user www-user`

View File

@@ -41,7 +41,7 @@ printHelp() {
--compat --compat
Build/install MC locally without minimum library specifiers Build/install MC locally without minimum library specifiers
--mcversion VERSION --mcversion VERSION
Specify the MC version, ex. "29.0.58" (Default: latest) Specify the MC version, ex. "30.0.17" (Default: latest)
--outputdir PATH --outputdir PATH
Generate rpmbuild output in this directory (Default: ./output) Generate rpmbuild output in this directory (Default: ./output)
--restorefile RESTOREFILE --restorefile RESTOREFILE
@@ -333,7 +333,7 @@ getVersion() {
debug "Running: ${FUNCNAME[0]}" debug "Running: ${FUNCNAME[0]}"
declare -g MCVERSION VERSION_SOURCE MVERSION MCPKG MCRPM BASE="buster" #BASE_NEXT="bullseye" declare -g MCVERSION VERSION_SOURCE MVERSION MCPKG MCRPM BASE="buster" #BASE_NEXT="bullseye"
declare boardurl="https://yabb.jriver.com/interact/index.php/board,76.0.html" # MC29 (Buster) declare boardurl="https://yabb.jriver.com/interact/index.php/board,76.0.html" # MC30 (Buster)
# User input # User input
if [[ -v MCVERSION && "$MCVERSION" =~ ([0-9]+.[0-9]+.[0-9]+) ]]; then if [[ -v MCVERSION && "$MCVERSION" =~ ([0-9]+.[0-9]+.[0-9]+) ]]; then
@@ -761,7 +761,7 @@ installMCDEB() {
####################################### #######################################
installMCRPM() { installMCRPM() {
debug "Running: ${FUNCNAME[0]}" debug "Running: ${FUNCNAME[0]}"
installPackage --skip-check-installed --nogpgcheck --allowerasing "$MCRPM" installPackage --skip-check-installed --nogpgcheck --allow-erasing "$MCRPM"
} }