Properly detect if git is installed using scoop regardless of scope (#278)

kborowinski · kelleyma49 · commit b6faa3b1c6b9 · 2024-09-29T21:17:23.000-07:00
This fixes the issue #272
diff --git a/PSFzf.Git.ps1 b/PSFzf.Git.ps1
@@ -62,7 +62,7 @@ function SetupGitPaths() {
                 $script:scoopInfo = Get-Command scoop -ErrorAction Ignore
                 if ($null -ne $script:scoopInfo) {
                     # Detect if git is installed using scoop (using shims)
-                    if ((Split-Path $gitInfo.Source -Parent) -eq (Split-Path $script:scoopInfo.Source -Parent)) {
+                    if ($gitInfo.Source -match 'scoop[\\/]shims') {
                         # Get the proper git position relative to scoop shims" position
                         $gitInfo = Get-Command "$($gitInfo.Source)\..\..\apps\git\current\bin\git.exe"
                     }

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ function SetupGitPaths() {`
`62`	`62`	`$script:scoopInfo = Get-Command scoop -ErrorAction Ignore`
`63`	`63`	`if ($null -ne $script:scoopInfo) {`
`64`	`64`	`# Detect if git is installed using scoop (using shims)`
`65`		`- if ((Split-Path $gitInfo.Source -Parent) -eq (Split-Path $script:scoopInfo.Source -Parent)) {`
	`65`	`+ if ($gitInfo.Source -match 'scoop[\\/]shims') {`
`66`	`66`	`# Get the proper git position relative to scoop shims" position`
`67`	`67`	`$gitInfo = Get-Command "$($gitInfo.Source)\..\..\apps\git\current\bin\git.exe"`
`68`	`68`	`}`