diff --git a/Casks/s/semeru-jdk-open.rb b/Casks/s/semeru-jdk-open.rb index bc449b84ce45..481e434b6cde 100644 --- a/Casks/s/semeru-jdk-open.rb +++ b/Casks/s/semeru-jdk-open.rb @@ -5,7 +5,7 @@ sha256 arm: "ec5d1b0cb5ba93a2489a04349b639779c741f70e32a3c4a40d5badff9c1d1438", intel: "5eceb275150ba66cf50231bc98d7ab808516cff886f094b22186b1497bcd1d09" - url "https://github.com/ibmruntimes/semeru#{version.csv.first}-binaries/releases/download/jdk-#{version.csv.first}%2B#{version.csv.second}_#{version.csv.third}/ibm-semeru-open-jdk_#{arch}_mac_#{version.csv.first}_#{version.csv.second}_#{version.csv.third}.pkg", + url "https://github.com/ibmruntimes/semeru#{version.major}-binaries/releases/download/jdk-#{version.csv.first}%2B#{version.csv.second}_#{version.csv.third}/ibm-semeru-open-jdk_#{arch}_mac_#{version.csv.first}_#{version.csv.second}_#{version.csv.third}.pkg", verified: "github.com/ibmruntimes/" name "IBM Semeru Runtime (JDK) Open Edition" desc "Production-ready JDK with the OpenJDK class libraries and the Eclipse OpenJ9 JVM" @@ -13,7 +13,7 @@ livecheck do url :url - regex(/^jdk[._-](\d+)(?:[.+](\d+)*)[._-](.+?)$/i) + regex(/^jdk[._-](\d+[\.\d+]*)[+](\d+)[._-](.+?)$/i) strategy :github_latest do |json, regex| json["tag_name"]&.scan(regex)&.map { |match| "#{match[0]},#{match[1]},#{match[2]}" } end @@ -21,7 +21,7 @@ pkg "ibm-semeru-open-jdk_#{arch}_mac_#{version.csv.first}_#{version.csv.second}_#{version.csv.third}.pkg" - uninstall pkgutil: "net.ibm-semeru-open.#{version.csv.first}.jdk" + uninstall pkgutil: "net.ibm-semeru-open.#{version.major}.jdk" # No zap stanza required end diff --git a/Casks/s/semeru-jdk-open@22.rb b/Casks/s/semeru-jdk-open@22.rb index ed4140b6a7e6..18c1d49d1aba 100644 --- a/Casks/s/semeru-jdk-open@22.rb +++ b/Casks/s/semeru-jdk-open@22.rb @@ -5,7 +5,7 @@ sha256 arm: "f59899423427cc91fec67f107d69fcf1050e421998a1f5cd6a0917ead54e5dc9", intel: "529754faa471cbbe40e36fc475dcd8e6f2179ee972ac2eb14117c1b58c119153" - url "https://github.com/ibmruntimes/semeru#{version.csv.first}-binaries/releases/download/jdk-#{version.csv.first}%2B#{version.csv.second}_#{version.csv.third}/ibm-semeru-open-jdk_#{arch}_mac_#{version.csv.first}_#{version.csv.second}_#{version.csv.third}.pkg", + url "https://github.com/ibmruntimes/semeru#{version.major}-binaries/releases/download/jdk-#{version.csv.first}%2B#{version.csv.second}_#{version.csv.third}/ibm-semeru-open-jdk_#{arch}_mac_#{version.csv.first}_#{version.csv.second}_#{version.csv.third}.pkg", verified: "github.com/ibmruntimes/" name "IBM Semeru Runtime (JDK) Open Edition" desc "Production-ready JDK with the OpenJDK class libraries and the Eclipse OpenJ9 JVM" @@ -13,7 +13,7 @@ livecheck do url :url - regex(/^jdk[._-](\d+)(?:[.+](\d+)*)[._-](.+?)$/i) + regex(/^jdk[._-](\d+[\.\d+]*)[+](\d+)[._-](.+?)$/i) strategy :github_latest do |json, regex| json["tag_name"]&.scan(regex)&.map { |match| "#{match[0]},#{match[1]},#{match[2]}" } end @@ -21,7 +21,7 @@ pkg "ibm-semeru-open-jdk_#{arch}_mac_#{version.csv.first}_#{version.csv.second}_#{version.csv.third}.pkg" - uninstall pkgutil: "net.ibm-semeru-open.#{version.csv.first}.jdk" + uninstall pkgutil: "net.ibm-semeru-open.#{version.major}.jdk" # No zap stanza required end