Skip to content
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

fix: force to add new main bucket #3419

Merged
merged 2 commits into from
Apr 30, 2019
Merged

fix: force to add new main bucket #3419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5697551
fix: force to add new main bucket
h404bi Apr 30, 2019
b6361df
fix(git): use internal get config function
h404bi Apr 30, 2019
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
8 changes: 8 additions & 0 deletions bin/scoop.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@ set-strictmode -off

reset_aliases

# TODO: remove this in a few weeks
if ((Get-LocalBucket) -notcontains 'main') {
warn "The main bucket of Scoop has been separated to 'https://github.com/scoopinstaller/scoop-main'"
warn "You don't have the main bucket added, adding main bucket for you..."
add_bucket 'main'
exit
}

$commands = commands
if ('--version' -contains $cmd -or (!$cmd -and '-v' -contains $args)) {
Push-Location $(versiondir 'scoop' 'current')
Expand Down
2 changes: 1 addition & 1 deletion lib/git.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
function git_proxy_cmd {
$proxy = $(scoop config proxy)
$proxy = get_config 'proxy'
$cmd = "git $($args | ForEach-Object { "$_ " })"
if($proxy -and $proxy -ne 'none') {
$cmd = "SET HTTPS_PROXY=$proxy&&SET HTTP_PROXY=$proxy&&$cmd"
Expand Down