Strip query parameters when determining filename

Signed-off-by: gscho <greg.c.schofield@gmail.com>
chef · Mar 17, 2021 · 2dc8254 · 2dc8254
1 parent 4380052
commit 2dc8254
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/mixlib/install/generator/bourne/scripts/fetch_package.sh b/lib/mixlib/install/generator/bourne/scripts/fetch_package.sh
@@ -14,7 +14,7 @@
 # $filetype: Type of the file downloaded.
 ############
 
-filename=`echo $download_url | sed -e 's/^.*\///'`
+filename=`echo $download_url | sed -e 's/^.*\///' | sed -e 's/?.*//'`
 filetype=`echo $filename | sed -e 's/^.*\.//'`
 
 # use either $tmp_dir, the provided directory (-d) or the provided filename (-f)

diff --git a/lib/mixlib/install/generator/powershell/scripts/install_project.ps1.erb b/lib/mixlib/install/generator/powershell/scripts/install_project.ps1.erb
@@ -73,7 +73,7 @@ function Install-Project {
 
   $cached_installer_available = $false
   $verify_checksum = $true
-  
+
   if (-not [string]::IsNullOrEmpty($download_url_override)) {
     $download_url = $download_url_override
     $sha256 = $checksum
@@ -91,7 +91,7 @@ function Install-Project {
     }
   }
   else {
-    $filename = ($download_url -split '/')[-1]
+    $filename = (([System.Uri]$download_url).AbsolutePath -split '/')[-1]
   }
   Write-Verbose "Download directory: $download_directory"
   Write-Verbose "Filename: $filename"