diff --git a/corretto-jdk-11/corretto11jdk.nuspec b/corretto-jdk-11/corretto11jdk.nuspec index 86166ba..94c2be0 100644 --- a/corretto-jdk-11/corretto11jdk.nuspec +++ b/corretto-jdk-11/corretto11jdk.nuspec @@ -2,7 +2,7 @@ corretto11jdk - 11.0.22.71 + 11.0.22.7.1 https://github.com/ajshastri/chocolatey-packages/tree/master/corretto-jdk-11 https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/aws-corretto.png Corretto 11 JDK diff --git a/corretto-jdk-11/tools/chocolateyinstall.ps1 b/corretto-jdk-11/tools/chocolateyinstall.ps1 index 8c568cf..64bb013 100644 --- a/corretto-jdk-11/tools/chocolateyinstall.ps1 +++ b/corretto-jdk-11/tools/chocolateyinstall.ps1 @@ -1,7 +1,7 @@ $packageArgs = @{ PackageName = $env:ChocolateyPackageName - Url64bit = 'https://corretto.aws/downloads/resources/11.0.22.71/amazon-corretto-11.0.22.71-windows-x64-jdk.msi' - Checksum64 = '59c529c07d2a79896ab67bd04d1e8fef' + Url64bit = 'https://corretto.aws/downloads/resources/11.0.22.7.1/amazon-corretto-11.0.22.7.1-windows-x64-jdk.msi' + Checksum64 = '59c529c07d2a79896ab627bd04d1e8fef' ChecksumType64 = 'md5' fileType = 'msi' silentArgs = "INSTALLLEVEL=3 /quiet" diff --git a/corretto-jdk-17/corretto17jdk.nuspec b/corretto-jdk-17/corretto17jdk.nuspec index 0044971..7d69cda 100644 --- a/corretto-jdk-17/corretto17jdk.nuspec +++ b/corretto-jdk-17/corretto17jdk.nuspec @@ -2,7 +2,7 @@ corretto17jdk - 17.0.10.71 + 17.0.10.7.1 https://github.com/ajshastri/chocolatey-packages/tree/master/corretto-jdk-17 https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/aws-corretto.png Corretto 17 JDK diff --git a/corretto-jdk-17/tools/chocolateyinstall.ps1 b/corretto-jdk-17/tools/chocolateyinstall.ps1 index 92ee6c5..4ecbabe 100644 --- a/corretto-jdk-17/tools/chocolateyinstall.ps1 +++ b/corretto-jdk-17/tools/chocolateyinstall.ps1 @@ -1,7 +1,7 @@ $packageArgs = @{ PackageName = $env:ChocolateyPackageName - Url64bit = 'https://corretto.aws/downloads/resources/17.0.10.71/amazon-corretto-17.0.10.71-windows-x64-jdk.msi' - Checksum64 = '2bc47187eea0e84dae73013b762148d5' + Url64bit = 'https://corretto.aws/downloads/resources/17.0.10.7.1/amazon-corretto-17.0.10.7.1-windows-x64-jdk.msi' + Checksum64 = '2bc47187eea0e84dae732013b762148d5' ChecksumType64 = 'md5' fileType = 'msi' silentArgs = "INSTALLLEVEL=3 /quiet" diff --git a/corretto-jdk-21/corretto21jdk.nuspec b/corretto-jdk-21/corretto21jdk.nuspec index f0d8626..9c4f2d5 100644 --- a/corretto-jdk-21/corretto21jdk.nuspec +++ b/corretto-jdk-21/corretto21jdk.nuspec @@ -2,7 +2,7 @@ corretto21jdk - 21.0.2.131 + 21.0.2.13.1 https://github.com/ajshastri/chocolatey-packages/tree/master/corretto-jdk-21 https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/aws-corretto.png Corretto JDK diff --git a/corretto-jdk-21/tools/chocolateyinstall.ps1 b/corretto-jdk-21/tools/chocolateyinstall.ps1 index 4a71008..900c2e5 100644 --- a/corretto-jdk-21/tools/chocolateyinstall.ps1 +++ b/corretto-jdk-21/tools/chocolateyinstall.ps1 @@ -1,7 +1,7 @@ $packageArgs = @{ PackageName = $env:ChocolateyPackageName - Url64bit = 'https://corretto.aws/downloads/resources/21.0.2.131/amazon-corretto-21.0.2.131-windows-x64-jdk.msi' - Checksum64 = '58899be77c0992cce9317389de1cbeb8' + Url64bit = 'https://corretto.aws/downloads/resources/21.0.2.13.1/amazon-corretto-21.0.2.13.1-windows-x64-jdk.msi' + Checksum64 = '58899be77c0992cce29317389de1cbeb8' ChecksumType64 = 'md5' fileType = 'msi' silentArgs = "INSTALLLEVEL=3 /quiet" diff --git a/corretto-jdk/correttojdk.nuspec b/corretto-jdk/correttojdk.nuspec index 45326ad..db1c227 100644 --- a/corretto-jdk/correttojdk.nuspec +++ b/corretto-jdk/correttojdk.nuspec @@ -2,7 +2,7 @@ correttojdk - 21.0.2.131 + 21.0.2.13.1 https://github.com/ajshastri/chocolatey-packages/tree/master/corretto-jdk https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/aws-corretto.png Corretto JDK diff --git a/corretto-jdk/tools/chocolateyinstall.ps1 b/corretto-jdk/tools/chocolateyinstall.ps1 index 8ae6c3d..c799b93 100644 --- a/corretto-jdk/tools/chocolateyinstall.ps1 +++ b/corretto-jdk/tools/chocolateyinstall.ps1 @@ -1,6 +1,6 @@ $packageArgs = @{ PackageName = $env:ChocolateyPackageName - Url64bit = 'https://corretto.aws/downloads/resources/21.0.2.131/amazon-corretto-21.0.2.131-windows-x64-jdk.msi' + Url64bit = 'https://corretto.aws/downloads/resources/21.0.2.13.1/amazon-corretto-21.0.2.13.1-windows-x64-jdk.msi' Checksum64 = '58899be77c0992cce93172389de1cbeb8' ChecksumType64 = 'md5' fileType = 'msi' diff --git a/scripts/corretto-sync.sh b/scripts/corretto-sync.sh index d7fb29d..10d29a4 100755 --- a/scripts/corretto-sync.sh +++ b/scripts/corretto-sync.sh @@ -9,11 +9,13 @@ MAILVAL=false function correttodl { JVERSION="$1" PACKAGE="$2" - VERSIONNEW=$(curl -s -L https://api.github.com/repos/corretto/corretto-${JVERSION}/releases/latest | jq -r '.tag_name' | awk -F. '{print $1"."$2"."$3"."$4$5}') + DLVERSIONNEW=$(curl -s -L https://api.github.com/repos/corretto/corretto-${JVERSION}/releases/latest | jq -r '.tag_name') + VERSIONNEW=$(echo $DLVERSIONNEW | awk -F. '{print $1"."$2"."$3"."$4$5}') + MD5NEW=$(curl -L -s https://corretto.aws/downloads/latest_checksum/amazon-corretto-${JVERSION}-x64-windows-${PACKAGE}.msi) # DLURL="https://corretto.aws/downloads/latest/amazon-corretto-${JVERSION}-x64-windows-${PACKAGE}.msi" - DLURL="https://corretto.aws/downloads/resources/${VERSIONNEW}/amazon-corretto-${VERSIONNEW}-windows-x64-${PACKAGE}.msi" - DLFILE="amazon-corretto-${VERSIONNEW}-windows-x64-${PACKAGE}.msi" + DLURL="https://corretto.aws/downloads/resources/${DLVERSIONNEW}/amazon-corretto-${DLVERSIONNEW}-windows-x64-${PACKAGE}.msi" + DLFILE="amazon-corretto-${DLVERSIONNEW}-windows-x64-${PACKAGE}.msi" echo "Latest file of ${JVERSION} is ${DLFILE} with {MD5NEW} ${MD5NEW} for ${VERSIONNEW}" MD5ORIG=$(grep -i checksum64 corretto-${PACKAGE}-${JVERSION}/tools/chocolateyinstall.ps1 | awk -F\' '{print $2}') @@ -24,7 +26,7 @@ function correttodl { if [[ "${MD5NEW}" != "${MD5ORIG}" ]] then # COMMITYES=TRUE - echo "${MD5NEW} is not the same as ${MD5ORIG} for ${VERSIONNEW}" + echo "${MD5NEW} is not the same as ${MD5ORIG} for ${DLVERSIONNEW}" echo "Updating file corretto-${PACKAGE}-${JVERSION}/tools/chocolateyinstall.ps1 with the new MD5" ${SED} -i "s@${MD5ORIG}@${MD5NEW}@g" corretto-${PACKAGE}-${JVERSION}/tools/chocolateyinstall.ps1 echo "Updating file corretto-${PACKAGE}-${JVERSION}/corretto${JVERSION}${PACKAGE}.nuspec with the new version - ${VERSIONORIG} to ${VERSIONNEW}" @@ -43,7 +45,7 @@ function correttodl { ${SED} -i "s@${URLORIG}@${DLURL}@g" corretto-${PACKAGE}/tools/chocolateyinstall.ps1 fi - echo "Latest file of ${JVERSION} is ${DLFILE} with {MD5NEW} ${MD5NEW} for ${VERSIONNEW}" + echo "Latest file of ${JVERSION} is ${DLFILE} with {MD5NEW} ${MD5NEW} for ${DLVERSIONNEW}" MAILVAL=true fi }