Merge branch 'master' of github.com:codac-team/codac

codac-team · Jun 1, 2023 · 3477015 · 3477015
2 parents c2e7057 + 7ff6f67
commit 3477015
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/unixmatrix.yml b/.github/workflows/unixmatrix.yml
@@ -137,7 +137,8 @@ jobs:
         cd packages/choco
         sed_param=s/\<version\>1\<\\/version\>/\<version\>${PACKAGE_VERSION}\<\\/version\>/
         sed -i "$sed_param" codac/codac.nuspec
-        sed_param=s/codac-1/codac-${PACKAGE_VERSION}/
+        sed_param=s/download\\/v1\\/codac/download\\/v${PACKAGE_VERSION}\\/codac/
+        sed -i "$sed_param" codac/codac.nuspec
         sed -i "$sed_param" codac/tools/chocolateyinstall.ps1
         mv -f codac codac.$PACKAGE_VERSION
         cd codac.$PACKAGE_VERSION

diff --git a/packages/choco/codac/codac.nuspec b/packages/choco/codac/codac.nuspec
@@ -34,7 +34,7 @@ The following package parameters can be set:
 - `/NoRegistry` - Will not try to update Windows registry.
 To pass package parameters, use `--params "''"` (e.g. `choco install codac --params "'/NoPath /NoRegistry'"`), and to install another binary package, try e.g.
 ```
-choco install -y --ignore-dependencies codac --params "'/url:https://github.com/codac-team/codac/releases/download/codac-1.2.2/codac_x86_vc15.zip'"
+choco install -y --ignore-dependencies codac --params "'/url:https://github.com/codac-team/codac/releases/download/v1/codac_x64_vc17.zip'"
 ```
     </description>
     <releaseNotes>https://github.com/codac-team/codac/releases</releaseNotes>

diff --git a/packages/choco/codac/tools/chocolateyinstall.ps1 b/packages/choco/codac/tools/chocolateyinstall.ps1
@@ -17,9 +17,9 @@ $root = Join-Path $installDir "codac"
 New-Item -ItemType Directory -Force -Path $root | Out-Null
 
 if (!$pp['url']) { 
-	$url = 'https://github.com/lebarsfa/codac/releases/download/codac-1/codac_x86_mingw$MinGWMVer.zip'
+	$url = 'https://github.com/codac-team/codac/releases/download/v1/codac_x86_mingw11.zip'
 	$checksum = 'EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE'
-	$url64 = 'https://github.com/lebarsfa/codac/releases/download/codac-1/codac_x64_mingw$MinGWMVer.zip'
+	$url64 = 'https://github.com/codac-team/codac/releases/download/v1/codac_x64_mingw11.zip'
 	$checksum64 = 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF'
 	$packageArgs = @{
 		packageName   = $env:ChocolateyPackageName

diff --git a/packages/choco/codac/tools/sharedVars.ps1 b/packages/choco/codac/tools/sharedVars.ps1
@@ -1,3 +1,4 @@
+# Some of these variables might not be used in links to simplify parsing of files...
 if ((Get-ProcessorBits 32) -or $env:ChocolateyForceX86 -eq $true) { $arch = "x86" } else { $arch = "x64" }
 $MinGWMVer = "11"
 $CMakeRegistryPath = "HKCU:\SOFTWARE\Kitware\CMake"