Remove stale goenv shims from v2 installations during upgrade to v3

Author: AdamDrewsTR

cmd/root.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 	"os"
+	"path/filepath"
 	"strings"
 
 	"github.com/go-nv/goenv/internal/cmdutil"
@@ -62,6 +63,19 @@ var RootCmd = &cobra.Command{
 		// Store updated context back to command
 		cmd.SetContext(ctx)
 
+		// Remove stale goenv shim left over from v2.
+		// v2's goenv-rehash bakes the Homebrew Cellar path into shims at creation
+		// time (e.g. exec "/opt/homebrew/Cellar/goenv/2.2.38_1/libexec/goenv").
+		// After upgrading to v3, the old shim may still point to a deleted Cellar
+		// path, shadowing the real v3 binary. We only remove it if it contains
+		// "libexec/goenv" — the v2 fingerprint — to avoid deleting anything unexpected.
+		goenvShim := filepath.Join(cfg.ShimsDir(), "goenv")
+		if data, err := os.ReadFile(goenvShim); err == nil {
+			if strings.Contains(string(data), "libexec/goenv") {
+				_ = os.Remove(goenvShim)
+			}
+		}
+
 		// Propagate output options
 		utils.SetOutputOptions(NoColor, Plain)
 	},

install.ps1

@@ -3,19 +3,23 @@
 
 $ErrorActionPreference = "Stop"
 
+# Ensure TLS 1.2 for GitHub API/downloads (older Windows defaults to TLS 1.0)
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
 # Configuration
-$GOENV_ROOT = if ($env:GOENV_ROOT) { $env:GOENV_ROOT } else { "$HOME\.goenv" }
+$GOENV_ROOT = if ($env:GOENV_ROOT) { $env:GOENV_ROOT } else { Join-Path (if ($env:USERPROFILE) { $env:USERPROFILE } else { $HOME }) ".goenv" }
 $GITHUB_REPO = "go-nv/goenv"
-$INSTALL_DIR = "$GOENV_ROOT\bin"
+$INSTALL_DIR = Join-Path $GOENV_ROOT "bin"
 
-# Colors
-function Write-ColorOutput($ForegroundColor) {
-    $fc = $host.UI.RawUI.ForegroundColor
-    $host.UI.RawUI.ForegroundColor = $ForegroundColor
-    if ($args) {
-        Write-Output $args
-    }
-    $host.UI.RawUI.ForegroundColor = $fc
+# Colors — use Write-Host which works in non-interactive/piped contexts
+function Write-ColorOutput {
+    param(
+        [Parameter(Position=0)]
+        [System.ConsoleColor]$ForegroundColor,
+        [Parameter(Position=1, ValueFromRemainingArguments)]
+        [string[]]$Message
+    )
+    Write-Host ($Message -join ' ') -ForegroundColor $ForegroundColor
 }
 
 # Detect architecture
@@ -85,35 +89,48 @@ function Install-Binary {
         # Copy binary
         $binaryPath = Join-Path $tmpDir "goenv.exe"
         if (Test-Path $binaryPath) {
-            Copy-Item -Path $binaryPath -Destination "$INSTALL_DIR\goenv.exe" -Force
+            Copy-Item -Path $binaryPath -Destination (Join-Path $INSTALL_DIR "goenv.exe") -Force
         } else {
             throw "Binary not found in archive"
         }
 
         # Copy completions if they exist
         $completionsPath = Join-Path $tmpDir "completions"
         if (Test-Path $completionsPath) {
-            $targetCompletions = "$GOENV_ROOT\completions"
+            $targetCompletions = Join-Path $GOENV_ROOT "completions"
             New-Item -ItemType Directory -Path $targetCompletions -Force | Out-Null
             Copy-Item -Path "$completionsPath\*" -Destination $targetCompletions -Recurse -Force -ErrorAction SilentlyContinue
         }
 
         Write-ColorOutput Green "goenv installed successfully!"
+        
+        # Remove stale goenv shim from v2 installations.
+        # v2's goenv-rehash bakes the Cellar/libexec path into shims at creation time.
+        # Only remove if it contains "libexec/goenv" — the v2 fingerprint.
+        $staleShim = Join-Path (Join-Path $GOENV_ROOT "shims") "goenv"
+        if (Test-Path $staleShim) {
+            $shimContent = Get-Content $staleShim -Raw -ErrorAction SilentlyContinue
+            if ($shimContent -and $shimContent -match "libexec/goenv") {
+                Write-ColorOutput Yellow "Removing stale v2 goenv shim..."
+                Remove-Item -Path $staleShim -Force -ErrorAction SilentlyContinue
+                Write-ColorOutput Green "Stale shim removed"
+            }
+        }
     }
     catch {
         Write-ColorOutput Red "Installation failed: $_"
         exit 1
     }
     finally {
-        # Cleanup
+        # Cleanup temp directory
         if (Test-Path $tmpDir) {
             Remove-Item -Path $tmpDir -Recurse -Force -ErrorAction SilentlyContinue
         }
     }
 }
 
 # Auto-configure PowerShell profile
-function Setup-PowerShellProfile {
+function Initialize-PowerShellProfile {
     $profilePath = $PROFILE
 
     # Create profile directory if it doesn't exist
@@ -184,7 +201,7 @@ function Main {
 
     $version = Get-LatestVersion
     Install-Binary -Version $version -Arch $arch
-    Setup-PowerShellProfile
+    Initialize-PowerShellProfile
     Show-Instructions
 }
 

install.sh

@@ -122,6 +122,17 @@ install_binary() {
     # Cleanup
     rm -rf "$tmp_dir"
 
+    # Remove stale goenv shim from v2 installations.
+    # v2's goenv-rehash bakes the Homebrew Cellar path into shims at creation time
+    # (e.g. exec "/opt/homebrew/Cellar/goenv/2.2.38_1/libexec/goenv"). After
+    # upgrading to v3, the old shim shadows the real v3 binary. We only remove
+    # it if it contains "libexec/goenv" — the v2 fingerprint.
+    if [ -f "$GOENV_ROOT/shims/goenv" ] && grep -q 'libexec/goenv' "$GOENV_ROOT/shims/goenv" 2>/dev/null; then
+        echo -e "${YELLOW}Removing stale v2 goenv shim...${NC}"
+        rm -f "$GOENV_ROOT/shims/goenv"
+        echo -e "${GREEN}✓ Stale shim removed${NC}"
+    fi
+    
     echo -e "${GREEN}✓ goenv installed successfully!${NC}"
 }
 

scripts/swap/main.go

@@ -7,6 +7,7 @@ import (
 	"os/exec"
 	"path/filepath"
 	"runtime"
+	"strings"
 
 	"github.com/go-nv/goenv/internal/platform"
 	"github.com/go-nv/goenv/internal/utils"
@@ -407,6 +408,24 @@ Options:
 		swapGoenvBinary(target)
 	}
 
+	// Remove stale goenv shim from v2 that may shadow the new binary.
+	// Only remove if it contains "libexec/goenv" — the v2 fingerprint.
+	goenvRoot := os.Getenv("GOENV_ROOT")
+	if goenvRoot == "" {
+		homeDir, _ := os.UserHomeDir()
+		goenvRoot = filepath.Join(homeDir, ".goenv")
+	}
+	staleShim := filepath.Join(goenvRoot, "shims", "goenv")
+	if data, err := os.ReadFile(staleShim); err == nil {
+		if strings.Contains(string(data), "libexec/goenv") {
+			if err := os.Remove(staleShim); err == nil {
+				success("Removed stale v2 goenv shim from " + staleShim)
+			} else {
+				warn(fmt.Sprintf("Could not remove stale shim %s: %v", staleShim, err))
+			}
+		}
+	}
+
 	fmt.Println()
 	success("Switch successful!")
 	warn("IMPORTANT: Reload your shell before testing:")