Merge pull request #2024 from RedBaron2/patch-27

chocolatey-community · Oct 25, 2022 · 9710ee3 · 9710ee3
2 parents b404f01 + ab1e682
commit 9710ee3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/automatic/freecad/tools/chocolateyInstall.ps1 b/automatic/freecad/tools/chocolateyInstall.ps1
@@ -17,7 +17,7 @@ $packageArgs = @{
   validExitCodes = @(0)
 }
 
-if ( $packageArgs.filetype -eq '7z' ) {
+if (( $packageArgs.filetype -eq '7z' ) -or ( $packageArgs.filetype -eq 'zip' )) {
   # Checking for Package Parameters
   $pp = ( Get-UserPackageParams -scrawl )
   if ($packageArgs.url64 -match "Conda") { $packageArgs.Remove("url"); $packageArgs.Remove("checksum"); $packageArgs.Remove("checksumType"); }

diff --git a/automatic/freecad/update_helper.ps1 b/automatic/freecad/update_helper.ps1
@@ -1,4 +1,3 @@
-
 function Get-FreeCad {
 param(
   [string]$Title,
@@ -7,14 +6,17 @@ param(
   [string]$uri = $releases,
   [string]$ScriptLocation = $PSScriptRoot
 )
-  $download_page = Invoke-WebRequest -Uri $uri -UseBasicParsing
+
+#  $download_page = Invoke-WebRequest -Uri $uri -UseBasicParsing
 
   switch ($kind) {
     'dev' {
+      $download_page = (Get-GitHubRelease -Owner "Freecad" -Name "Freecad-Bundle" -TagName "weekly-builds" -Verbose).assets
       $mobile = "Windows"
       $ext = "7z"
       $re64 = "(FreeCAD_weekly-builds)?((\-\d{2,6})+)?(\-conda)?(\-${mobile})(\-|.)?(x\d{2}_\d{2}\-)?(py\d{2,5})?(\.$ext)$"
-      $url64 = ( $download_page.Links | ? href -match $re64 | Select-Object -First 1 -ExpandProperty 'href' )
+#      $url64 = ( $download_page.Links | ? href -match $re64 | Select-Object -First 1 -ExpandProperty 'href' )
+      $url64 = ( $download_page | ? Name -match $re64 | Select-Object -First 1 -ExpandProperty 'browser_download_url' )
       "url64 -$url64-" | Write-Warning
       $PackageName  = "$Title"
       $Title        = "$Title"
@@ -27,20 +29,24 @@ param(
       $vert = "${version}-${kind}"
     }
     'portable' {
+      $download_page = (Get-GitHubRelease -Owner "Freecad" -Name "Freecad" -Verbose).assets
       $mobile = "portable"
       $ext = "zip"
       $re64 = "(FreeCAD\-)((\d+)?(\.))+?(\d)?(\-)(WIN)(\-)?(x\d{2})\-(${mobile})(\-|.)?(\d+)?(\.${ext})$"
-      $url64 = ( $download_page.Links | ? href -match $re64 | Sort-Object -Property 'href' -Descending | Select-Object -First 1 -ExpandProperty 'href' )
+#      $url64 = ( $download_page.Links | ? href -match $re64 | Sort-Object -Property 'href' -Descending | Select-Object -First 1 -ExpandProperty 'href' )
+      $url64 = ( $download_page | ? Name -match $re64 | Select-Object -First 1 -ExpandProperty 'browser_download_url' )
       $vert = "$version"
       $PackageName  = "$Title.$kind"
       $Title        = "$Title (Portable)"
       [version]$version = ( Get-Version (($url64.Split('\/'))[-1]) ).Version
     }
     'stable' {
+      $download_page =  (Get-GitHubRelease -Owner "Freecad" -Name "Freecad" -Verbose).assets
       $mobile = "installer"
       $ext = "exe"
       $re64 = "(FreeCAD\-)((\d+)?(\.))+?(\d)?(\-)(WIN)(\-)?(x\d{2})\-(${mobile})(\-|.)?(\d+)?(\.${ext})$"
-      $url64 = ( $download_page.Links | ? href -match $re64 | Sort-Object -Property 'href' -Descending | Select-Object -First 1 -ExpandProperty 'href' )
+#      $url64 = ( $download_page.Links | ? href -match $re64 | Sort-Object -Property 'href' -Descending | Select-Object -First 1 -ExpandProperty 'href' )
+      $url64 = ( $download_page | ? Name -match $re64 | Select-Object -First 1 -ExpandProperty 'browser_download_url' )
       $vert = "$version"
       $PackageName  = "$Title"
       $Title        = "$Title"
@@ -66,11 +72,11 @@ param(
  	$package = @{
     PackageName  = ($PackageName).ToLower()
     Title        = $Title
-    URL64        = $PreUrl + $url64
+    URL64        = $url64
     Version      = $vert
     fileType     = ($url64.Split("/")[-1]).Split(".")[-1]
     }
-   # Due to the dev package being pre-release software we are removing ReleaseNotes
+    # Due to the dev package being pre-release software we are removing ReleaseNotes
     if ($kind -ne "dev") {
       $package.Add( "ReleaseNotes", "https://www.freecadweb.org/wiki/Release_notes_$($version.Major).$($version.Minor)" )
     }