fix(buckets): Don't check remote URL of non-git buckets (#4923)

Author: niheaven

CHANGELOG.md

@@ -1,3 +1,9 @@
+## [Unreleased](https://github.com/ScoopInstaller/Scoop/compare/master...develop)
+
+### Bug Fixes
+
+- **bucket:** Don't check remote URL of non-git buckets ([#4923](https://github.com/ScoopInstaller/Scoop/issues/4923))
+
 ## [v0.2.0](https://github.com/ScoopInstaller/Scoop/compare/v0.1.0...v0.2.0) - 2022-05-10
 
 ### Features

lib/buckets.ps1

@@ -109,6 +109,7 @@ function Convert-RepositoryUri {
     [CmdletBinding()]
     param (
         [Parameter(Mandatory, Position = 0, ValueFromPipeline = $true)]
+        [AllowEmptyString()]
         [String] $Uri
     )
 
@@ -161,10 +162,12 @@ function add_bucket($name, $repo) {
         return 1
     }
     foreach ($bucket in Get-LocalBucket) {
-        $remote = git -C "$bucketsdir\$bucket" config --get remote.origin.url
-        if ((Convert-RepositoryUri -Uri $remote) -eq $uni_repo) {
-            warn "Bucket $bucket already exists for $repo"
-            return 2
+        if (Test-Path -Path "$bucketsdir\$bucket\.git") {
+            $remote = git -C "$bucketsdir\$bucket" config --get remote.origin.url
+            if ((Convert-RepositoryUri -Uri $remote) -eq $uni_repo) {
+                warn "Bucket $bucket already exists for $repo"
+                return 2
+            }
         }
     }
 

libexec/scoop-update.ps1

@@ -133,9 +133,15 @@ function update_scoop() {
         if (!(Test-Path (Join-Path $bucketLoc '.git'))) {
             if ($bucket -eq 'main') {
                 # Make sure main bucket, which was downloaded as zip, will be properly "converted" into git
-                Write-Host " Converting 'main' bucket to git..."
-                rm_bucket 'main'
-                add_bucket 'main'
+                Write-Host " Converting 'main' bucket to git repo..."
+                $status = rm_bucket 'main'
+                if ($status -ne 0) {
+                    abort "Failed to remove local 'main' bucket."
+                }
+                $status = add_bucket 'main' (known_bucket_repo 'main')
+                if ($status -ne 0) {
+                    abort "Failed to add remote 'main' bucket."
+                }
             } else {
                 Write-Host "'$bucket' is not a git repository. Skipped."
             }