Update for MC30 and v1.0 release
This commit is contained in:
13
installJRMC
13
installJRMC
@@ -7,17 +7,16 @@
|
|||||||
# https://www.apache.org/licenses/LICENSE-2.0
|
# https://www.apache.org/licenses/LICENSE-2.0
|
||||||
#
|
#
|
||||||
# TODO (v2)
|
# TODO (v2)
|
||||||
# 1. Raspberry Pi OS support
|
# 1. Interactive installation (ncurses?)
|
||||||
# 2. Interactive installation (ncurses?)
|
# 2. Additional containerization (createrepo and rpmbuild)
|
||||||
# 3. Additional containerization (createrepo and rpmbuild)
|
# 3. Tests
|
||||||
# 4. Tests
|
|
||||||
#
|
#
|
||||||
# BUGS
|
# BUGS
|
||||||
# 1. No createrepo on Mint
|
# 1. No createrepo on Mint
|
||||||
|
|
||||||
shopt -s extglob
|
shopt -s extglob
|
||||||
|
|
||||||
declare -g SCRIPTVERSION="1.0b17"
|
declare -g SCRIPTVERSION="1.0"
|
||||||
declare -g OUTPUTDIR="$PWD/output"
|
declare -g OUTPUTDIR="$PWD/output"
|
||||||
declare -g CREATEREPO_WEBROOT="/var/www/jriver"
|
declare -g CREATEREPO_WEBROOT="/var/www/jriver"
|
||||||
declare -g USER="${SUDO_USER:-$USER}"
|
declare -g USER="${SUDO_USER:-$USER}"
|
||||||
@@ -335,7 +334,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,74.0.html" # MC29 (Buster)
|
declare boardurl="https://yabb.jriver.com/interact/index.php/board,76.0.html" # MC29 (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
|
||||||
@@ -357,7 +356,7 @@ getVersion() {
|
|||||||
VERSION_SOURCE="webscrape"
|
VERSION_SOURCE="webscrape"
|
||||||
# Hardcoded
|
# Hardcoded
|
||||||
else
|
else
|
||||||
MCVERSION="29.0.58"
|
MCVERSION="29.0.66"
|
||||||
VERSION_SOURCE="hardcoded version"
|
VERSION_SOURCE="hardcoded version"
|
||||||
err "Warning! Using hardcoded version number"
|
err "Warning! Using hardcoded version number"
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user