fix: Homepage no longer downloaded on script

CHANGELOG.md

@@ -1,3 +1,17 @@
+## [Unreleased](https://github.com/ScoopInstaller/Scoop/compare/master...develop)
+
+### Bug Fixes
+
+- **scoop-download|install|update:** Fallback to default downloader when aria2 fails ([#4292](https://github.com/ScoopInstaller/Scoop/issues/4292))
+- **decompress**: `Expand-7zipArchive` only delete temp dir / `$extractDir` if it is empty ([#6092](https://github.com/ScoopInstaller/Scoop/issues/6092))
+- **commands**: Handling broken aliases ([#6141](https://github.com/ScoopInstaller/Scoop/issues/6141))
+- **shim:** Do not suppress `stderr`, properly check `wslpath`/`cygpath` command first ([#6114](https://github.com/ScoopInstaller/Scoop/issues/6114))
+- **scoop-bucket:** Add missing import for `no_junction` envs ([#6181](https://github.com/ScoopInstaller/Scoop/issues/6181))
+
+### Code Refactoring
+
+- **download:** Move download-related functions to 'download.ps1' ([#6095](https://github.com/ScoopInstaller/Scoop/issues/6095))
+
 ## [v0.5.2](https://github.com/ScoopInstaller/Scoop/compare/v0.5.1...v0.5.2) - 2024-07-26
 
 ### Bug Fixes
@@ -40,7 +54,7 @@
 - **checkver:** Correct error messages ([#6024](https://github.com/ScoopInstaller/Scoop/issues/6024))
 - **core:** Search for Git executable instead of any cmdlet ([#5998](https://github.com/ScoopInstaller/Scoop/issues/5998))
 - **core:** Use correct path in 'bash' ([#6006](https://github.com/ScoopInstaller/Scoop/issues/6006))
-- **core:** Limit the number of commands to get when search for git executable ([#6013](https://github.com/ScoopInstaller/Scoop/pull/6013))
+- **core:** Limit the number of commands to get when search for git executable ([#6013](https://github.com/ScoopInstaller/Scoop/issues/6013))
 - **decompress:** Match `extract_dir`/`extract_to` and archives ([#5983](https://github.com/ScoopInstaller/Scoop/issues/5983))
 - **json:** Serialize jsonpath return ([#5921](https://github.com/ScoopInstaller/Scoop/issues/5921))
 - **shim:** Restore original path for JAR cmd ([#6030](https://github.com/ScoopInstaller/Scoop/issues/6030))

bin/checkhashes.ps1

@@ -46,7 +46,7 @@ param(
 . "$PSScriptRoot\..\lib\autoupdate.ps1"
 . "$PSScriptRoot\..\lib\json.ps1"
 . "$PSScriptRoot\..\lib\versions.ps1"
-. "$PSScriptRoot\..\lib\install.ps1"
+. "$PSScriptRoot\..\lib\download.ps1"
 
 $Dir = Convert-Path $Dir
 if ($ForceUpdate) { $Update = $true }

bin/checkurls.ps1

@@ -28,7 +28,7 @@ param(
 
 . "$PSScriptRoot\..\lib\core.ps1"
 . "$PSScriptRoot\..\lib\manifest.ps1"
-. "$PSScriptRoot\..\lib\install.ps1"
+. "$PSScriptRoot\..\lib\download.ps1"
 
 $Dir = Convert-Path $Dir
 $Queue = @()

bin/checkver.ps1

@@ -73,7 +73,7 @@ param(
 . "$PSScriptRoot\..\lib\buckets.ps1"
 . "$PSScriptRoot\..\lib\json.ps1"
 . "$PSScriptRoot\..\lib\versions.ps1"
-. "$PSScriptRoot\..\lib\install.ps1" # needed for hash generation
+. "$PSScriptRoot\..\lib\download.ps1"
 
 if ($App -ne '*' -and (Test-Path $App -PathType Leaf)) {
     $Dir = Split-Path $App
@@ -279,25 +279,26 @@ while ($in_progress -gt 0) {
             next "'replace' requires 're' or 'regex'"
             continue
         }
-        $err = $ev.SourceEventArgs.Error
-        if ($err) {
-            next "$($err.message)`r`nURL $url is not valid"
-            continue
-        }
-
-        if ($url) {
-            $ms = New-Object System.IO.MemoryStream
-            $ms.Write($result, 0, $result.Length)
-            $ms.Seek(0, 0) | Out-Null
-            if ($result[0] -eq 0x1F -and $result[1] -eq 0x8B) {
-                $ms = New-Object System.IO.Compression.GZipStream($ms, [System.IO.Compression.CompressionMode]::Decompress)
-            }
-            $page = (New-Object System.IO.StreamReader($ms, (Get-Encoding $wc))).ReadToEnd()
-        }
-        $source = $url
         if ($script) {
             $page = Invoke-Command ([scriptblock]::Create($script -join "`r`n"))
             $source = 'the output of script'
+        } else {
+            $err = $ev.SourceEventArgs.Error
+            if ($err) {
+                next "$($err.message)`r`nURL $url is not valid"
+                continue
+            }
+
+            if ($url) {
+                $ms = New-Object System.IO.MemoryStream
+                $ms.Write($result, 0, $result.Length)
+                $ms.Seek(0, 0) | Out-Null
+                if ($result[0] -eq 0x1F -and $result[1] -eq 0x8B) {
+                    $ms = New-Object System.IO.Compression.GZipStream($ms, [System.IO.Compression.CompressionMode]::Decompress)
+                }
+                $page = (New-Object System.IO.StreamReader($ms, (Get-Encoding $wc))).ReadToEnd()
+            }
+            $source = $url
         }
 
         if ($jsonpath) {

bin/describe.ps1

@@ -23,6 +23,7 @@ param(
 . "$PSScriptRoot\..\lib\core.ps1"
 . "$PSScriptRoot\..\lib\manifest.ps1"
 . "$PSScriptRoot\..\lib\description.ps1"
+. "$PSScriptRoot\..\lib\download.ps1"
 
 $Dir = Convert-Path $Dir
 $Queue = @()

lib/autoupdate.ps1

@@ -1,4 +1,17 @@
 # Must included with 'json.ps1'
+
+function format_hash([String] $hash) {
+    $hash = $hash.toLower()
+    switch ($hash.Length) {
+        32 { $hash = "md5:$hash" } # md5
+        40 { $hash = "sha1:$hash" } # sha1
+        64 { $hash = $hash } # sha256
+        128 { $hash = "sha512:$hash" } # sha512
+        default { $hash = $null }
+    }
+    return $hash
+}
+
 function find_hash_in_rdf([String] $url, [String] $basename) {
     $xml = $null
     try {

lib/commands.ps1

@@ -4,7 +4,7 @@
 
 function command_files {
     (Get-ChildItem "$PSScriptRoot\..\libexec") + (Get-ChildItem "$scoopdir\shims") |
-        Where-Object 'scoop-.*?\.ps1$' -Property Name -Match
+    Where-Object 'scoop-.*?\.ps1$' -Property Name -Match
 }
 
 function commands {
@@ -86,7 +86,9 @@ function rm_alias {
     }
 
     info "Removing alias '$name'..."
-    Remove-Item "$(shimdir $false)\scoop-$name.ps1"
+    if (Test-Path "$(shimdir $false)\scoop-$name.ps1") {
+        Remove-Item "$(shimdir $false)\scoop-$name.ps1"
+    }
     $aliases.PSObject.Properties.Remove($name)
     set_config ALIAS $aliases | Out-Null
 }
@@ -98,11 +100,19 @@ function list_aliases {
 
     $aliases = get_config ALIAS ([PSCustomObject]@{})
     $alias_info = $aliases.PSObject.Properties.Name | Where-Object { $_ } | ForEach-Object {
+        # Mark the alias as <BROKEN>, if the alias script file does NOT exist.
+        if (!(Test-Path "$(shimdir $false)\scoop-$_.ps1")) {
+            [PSCustomObject]@{
+                Name    = $_
+                Command = '<BROKEN>'
+            }
+            return
+        }
         $content = Get-Content (command_path $_)
         [PSCustomObject]@{
             Name    = $_
-            Summary = (summary $content).Trim()
             Command = ($content | Select-Object -Skip 1).Trim()
+            Summary = (summary $content).Trim()
         }
     }
     if (!$alias_info) {