Skip to content

Commit fd5d2fe

Browse files
h404bir15ch13
authored andcommitted
fix: force to add new main bucket (#3419)
* fix: force to add new main bucket * fix(git): use internal get config function
1 parent 2db651c commit fd5d2fe

2 files changed

Lines changed: 9 additions & 1 deletion

File tree

bin/scoop.ps1

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,14 @@ set-strictmode -off
1111

1212
reset_aliases
1313

14+
# TODO: remove this in a few weeks
15+
if ((Get-LocalBucket) -notcontains 'main') {
16+
warn "The main bucket of Scoop has been separated to 'https://github.com/scoopinstaller/scoop-main'"
17+
warn "You don't have the main bucket added, adding main bucket for you..."
18+
add_bucket 'main'
19+
exit
20+
}
21+
1422
$commands = commands
1523
if ('--version' -contains $cmd -or (!$cmd -and '-v' -contains $args)) {
1624
Push-Location $(versiondir 'scoop' 'current')

lib/git.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
function git_proxy_cmd {
2-
$proxy = $(scoop config proxy)
2+
$proxy = get_config 'proxy'
33
$cmd = "git $($args | ForEach-Object { "$_ " })"
44
if($proxy -and $proxy -ne 'none') {
55
$cmd = "SET HTTPS_PROXY=$proxy&&SET HTTP_PROXY=$proxy&&$cmd"

0 commit comments

Comments
 (0)