From cd3d45ed8c7b1123bf5d2dffccc5241e2ec4971c Mon Sep 17 00:00:00 2001 From: Kyle Buller Date: Tue, 28 Sep 2021 18:16:16 -0500 Subject: [PATCH] Update Classic matching for 1.14 Fixes #110 --- release.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/release.sh b/release.sh index 3dcf0d4..8ec8141 100755 --- a/release.sh +++ b/release.sh @@ -995,7 +995,7 @@ toc_version="$root_toc_version" if [[ -n "$toc_version" && -z "$game_type" ]]; then # toc -> game type case $toc_version in - 113*) game_type="classic" ;; + 11[34]*) game_type="classic" ;; 205*) game_type="bcc" ;; *) game_type="retail" esac @@ -1011,15 +1011,15 @@ else fi # Check for other interface lines if [[ -z "$toc_version" ]] || \ - [[ "$game_type" == "classic" && "$toc_version" != "113"* ]] || \ + [[ "$game_type" == "classic" && ("$toc_version" != "113"* && "$toc_version" != "114"*) ]] || \ [[ "$game_type" == "bcc" && "$toc_version" != "205"* ]] || \ - [[ "$game_type" == "retail" && ("$toc_version" == "113"* || "$toc_version" == "205"*) ]] + [[ "$game_type" == "retail" && ("$toc_version" == "113"* || "$toc_version" == "114"* || "$toc_version" == "205"*) ]] then toc_version="$game_type_toc_version" if [[ -z "$toc_version" ]]; then # Check @non-@ blocks case $game_type in - classic) toc_version=$( sed -n '/@non-[-a-z]*@/,/@end-non-[-a-z]*@/{//b;p}' <<< "$toc_file" | awk '/#[[:blank:]]*## Interface:[[:blank:]]*(113)/ { print $NF; exit }' ) ;; + classic) toc_version=$( sed -n '/@non-[-a-z]*@/,/@end-non-[-a-z]*@/{//b;p}' <<< "$toc_file" | awk '/#[[:blank:]]*## Interface:[[:blank:]]*(11[34])/ { print $NF; exit }' ) ;; bcc) toc_version=$( sed -n '/@non-[-a-z]*@/,/@end-non-[-a-z]*@/{//b;p}' <<< "$toc_file" | awk '/#[[:blank:]]*## Interface:[[:blank:]]*(205)/ { print $NF; exit }' ) ;; esac # This becomes the actual interface version after string replacements