Skip to content

Change url() scope to avoid conflict with global aliases (e.g. Pansies) #4342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rashil2000 merged 1 commit into from
Nov 1, 2021
Merged

Change url() scope to avoid conflict with global aliases (e.g. Pansies) #4342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/depends.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ function script_deps($script) {
function install_deps($manifest, $arch) {
$deps = @()

if (!(Test-HelperInstalled -Helper 7zip) -and (Test-7zipRequirement -URL (url $manifest $arch))) {
if (!(Test-HelperInstalled -Helper 7zip) -and (Test-7zipRequirement -URL (script:url $manifest $arch))) {
$deps += '7zip'
}
if (!(Test-HelperInstalled -Helper Lessmsi) -and (Test-LessmsiRequirement -URL (url $manifest $arch))) {
if (!(Test-HelperInstalled -Helper Lessmsi) -and (Test-LessmsiRequirement -URL (script:url $manifest $arch))) {
$deps += 'lessmsi'
}
if (!(Test-HelperInstalled -Helper Innounp) -and $manifest.innosetup) {
Expand Down
6 changes: 3 additions & 3 deletions lib/install.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ function get_filename_from_metalink($file) {

function dl_with_cache_aria2($app, $version, $manifest, $architecture, $dir, $cookies = $null, $use_cache = $true, $check_hash = $true) {
$data = @{}
$urls = @(url $manifest $architecture)
$urls = @(script:url $manifest $architecture)

# aria2 input file
$urlstxt = Join-Path $cachedir "$app.txt"
Expand Down Expand Up @@ -526,7 +526,7 @@ function dl_urls($app, $version, $manifest, $bucket, $architecture, $dir, $use_c

# can be multiple urls: if there are, then msi or installer should go last,
# so that $fname is set properly
$urls = @(url $manifest $architecture)
$urls = @(script:url $manifest $architecture)

# can be multiple cookies: they will be used for all HTTP requests.
$cookies = $manifest.cookie
Expand Down Expand Up @@ -641,7 +641,7 @@ function hash_for_url($manifest, $url, $arch) {

if($hashes.length -eq 0) { return $null }

$urls = @(url $manifest $arch)
$urls = @(script:url $manifest $arch)

$index = [array]::indexof($urls, $url)
if($index -eq -1) { abort "Couldn't find hash in manifest for '$url'." }
Expand Down
⚡