Add logic allowing for next year pre-releases to not affect portable …

…folder suffix
chmaha · Dec 14, 2024 · 541bc35 · 541bc35
1 parent f158232
commit 541bc35
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 9 deletions.
diff --git a/Installers/ReaClassical-Windows-Go-Installer/shared.go b/Installers/ReaClassical-Windows-Go-Installer/shared.go
@@ -234,11 +234,38 @@ func getReaperVersion() (string, error) {
 }
 
 func getReaClassicalMajorVersion() (string, error) {
-	// Get the current year and extract the last two digits
+	// Get the current short year (YY)
 	currentYear := time.Now().Year() % 100
+	currentShortYear := fmt.Sprintf("%02d", currentYear)
 
-	// Convert the year to a string and return it
-	return fmt.Sprintf("%02d", currentYear), nil
+	// Get latest ReaClassical version number
+	resp, err := http.Get("https://raw.githubusercontent.com/chmaha/ReaClassical/main/ReaClassical/ReaClassical.lua")
+	if err != nil {
+		return "", err
+	}
+	defer resp.Body.Close()
+
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return "", err
+	}
+
+	pattern := `@version\s*(\d+)\.\d+`
+	re := regexp.MustCompile(pattern)
+	matches := re.FindStringSubmatch(string(body))
+
+	if len(matches) < 2 {
+		return "", fmt.Errorf("major version number not found")
+	}
+
+	majorVersion := matches[1]
+
+	// Compare the major version to the current short year
+	if majorVersion != currentShortYear {
+		majorVersion = currentShortYear
+	}
+
+	return majorVersion, nil
 }
 
 func replaceKeyInFile(filePath string) error {

diff --git a/Installers/ReaClassical_Linux.sh b/Installers/ReaClassical_Linux.sh
@@ -27,9 +27,13 @@ check_internet
 ver_txt="https://raw.githubusercontent.com/chmaha/ReaClassical/main/tested_reaper_ver.txt"
 ver=$(curl -sS "$ver_txt" | awk '/====/{getline; print}')
 
-# rcver_txt="https://raw.githubusercontent.com/chmaha/ReaClassical/main/ReaClassical/ReaClassical.lua"
-# rcver=$(curl -sS "$rcver_txt" | awk '/@version/{split($2, version, "."); print version[1]}')
-rcver=$(date +%y)
+rcver_txt="https://raw.githubusercontent.com/chmaha/ReaClassical/main/ReaClassical/ReaClassical.lua"
+rcver=$(curl -sS "$rcver_txt" | awk '/@version/{split($2, version, "."); print version[1]}')
+current_year=$(date +%y)
+
+if [ "$rcver" != "$current_year" ]; then
+  rcver=$current_year
+fi
 
 major=$(echo $ver | awk -F. '{print $1}')
 minor=$(echo $ver | awk -F. '{print $2}')

diff --git a/Installers/ReaClassical_Win32.exe b/Installers/ReaClassical_Win32.exe
diff --git a/Installers/ReaClassical_Win64.exe b/Installers/ReaClassical_Win64.exe
diff --git a/Installers/ReaClassical_macOS.sh b/Installers/ReaClassical_macOS.sh
@@ -27,9 +27,13 @@ check_internet
 ver_txt="https://raw.githubusercontent.com/chmaha/ReaClassical/main/tested_reaper_ver.txt"
 ver=$(curl -sS "$ver_txt" | awk '/====/{getline; print}')
 
-# rcver_txt="https://raw.githubusercontent.com/chmaha/ReaClassical/main/ReaClassical/ReaClassical.lua"
-# rcver=$(curl -sS "$rcver_txt" | awk '/@version/{split($2, version, "."); print version[1]}')
-rcver=$(date +%y)
+rcver_txt="https://raw.githubusercontent.com/chmaha/ReaClassical/main/ReaClassical/ReaClassical.lua"
+rcver=$(curl -sS "$rcver_txt" | awk '/@version/{split($2, version, "."); print version[1]}')
+current_year=$(date +%y)
+
+if [ "$rcver" != "$current_year" ]; then
+  rcver=$current_year
+fi
 
 rcfolder="ReaClassical_${rcver}"
 arch=`uname -m`