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

Tighten mcversion regex

Browse Source
This commit is contained in:
Bryan Roessler
2025-04-12 15:38:20 -04:00
parent 9eed36d353
commit 655a08f70d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
installJRMC
View File

@@ -18,7 +18,7 @@
# * Be careful with tabs in heredocs # * Be careful with tabs in heredocs
shopt -s extglob shopt -s extglob
declare -g SCRIPT_VERSION="1.4.9-dev" declare -g SCRIPT_VERSION="1.5.0-dev"
declare -g MC_REPO="bullseye" # should match the MC_VERSION declare -g MC_REPO="bullseye" # should match the MC_VERSION
# declare -g MC_REPO="bookworm" # should match the MC_VERSION # declare -g MC_REPO="bookworm" # should match the MC_VERSION
declare -g MC_VERSION="33.0.72" # do find all replace declare -g MC_VERSION="33.0.72" # do find all replace
@@ -148,12 +148,12 @@ parse_input() {
--outputdir) shift; OUTPUT_DIR="$1" ;; --outputdir) shift; OUTPUT_DIR="$1" ;;
--mcversion) --mcversion)
shift shift
if [[ $1 =~ [0-9]+\.[0-9]+\.[0-9]+-[0-9]+ ]]; then if [[ $1 =~ ^[0-9]+\.[0-9]+\.[0-9]+-[0-9]+$ ]]; then
USER_MC_VERSION="${1%-*}" USER_MC_VERSION="${1%-*}"
USER_MC_RELEASE="${1#*-}" USER_MC_RELEASE="${1#*-}"
elif [[ $1 =~ [0-9]+\.[0-9]+\.[0-9]+ ]]; then elif [[ $1 =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
USER_MC_VERSION="$1" USER_MC_VERSION="$1"
elif [[ $1 =~ [0-9][0-9] ]]; then elif [[ $1 =~ ^[0-9][0-9]$ ]]; then
case $1 in case $1 in
33) ;; # use update check to determine latest version 33) ;; # use update check to determine latest version
32) USER_MC_VERSION="32.0.58" ;; 32) USER_MC_VERSION="32.0.58" ;;
@@ -426,12 +426,12 @@ get_latest_mc_version() {
&& buildah run "$cnt" -- sh -c \ && buildah run "$cnt" -- sh -c \
"apt update --allow-insecure-repositories &>/dev/null" &>/dev/null \ "apt update --allow-insecure-repositories &>/dev/null" &>/dev/null \
&& MC_VERSION=$(buildah run "$cnt" -- apt-cache policy mediacenter?? | grep Candidate | awk '{print $2}' | sort -V | tail -n1) &>/dev/null \ && MC_VERSION=$(buildah run "$cnt" -- apt-cache policy mediacenter?? | grep Candidate | awk '{print $2}' | sort -V | tail -n1) &>/dev/null \
&& [[ $MC_VERSION =~ [0-9]+\.[0-9]+\.[0-9]+ ]]; then && [[ $MC_VERSION =~ ^[0-9]+\.[0-9]+\.[0-9]+ ]]; then
mc_version_source="containerized package manager" mc_version_source="containerized package manager"
execute buildah rm "$cnt" execute buildah rm "$cnt"
# Fallback to webscrape # Fallback to webscrape
elif MC_VERSION=$(download "$BOARD_URL" | grep -o "[0-9][0-9]\.[0-9]\.[0-9]\+" | head -n 1) \ elif MC_VERSION=$(download "$BOARD_URL" | grep -o "[0-9][0-9]\.[0-9]\.[0-9]\+" | head -n 1) \
&& [[ $MC_VERSION =~ [0-9]+\.[0-9]+\.[0-9]+ ]]; then && [[ $MC_VERSION =~ ^[0-9]+\.[0-9]+\.[0-9]+ ]]; then
mc_version_source="webscrape" mc_version_source="webscrape"
# Fallback to hardcoded value # Fallback to hardcoded value
else else