wip

Author: liangmiQwQ

packages/cli/install.ps1

@@ -297,6 +297,27 @@ function Get-PreviousInstallDir {
     return $oldDir
 }
 
+function Test-NestedInstallDir {
+    param(
+        [string]$OldDir,
+        [string]$NewDir
+    )
+    if ([string]::IsNullOrWhiteSpace($OldDir) -or [string]::IsNullOrWhiteSpace($NewDir)) {
+        return $false
+    }
+
+    $oldDir = Normalize-InstallDir $OldDir
+    $newDir = Normalize-InstallDir $NewDir
+    if ([string]::IsNullOrWhiteSpace($oldDir) -or [string]::IsNullOrWhiteSpace($newDir) -or $oldDir -eq $newDir) {
+        return $false
+    }
+
+    $oldPrefix = $oldDir.TrimEnd([System.IO.Path]::DirectorySeparatorChar, [System.IO.Path]::AltDirectorySeparatorChar) + [System.IO.Path]::DirectorySeparatorChar
+    $newPrefix = $newDir.TrimEnd([System.IO.Path]::DirectorySeparatorChar, [System.IO.Path]::AltDirectorySeparatorChar) + [System.IO.Path]::DirectorySeparatorChar
+    return $oldPrefix.StartsWith($newPrefix, [System.StringComparison]::OrdinalIgnoreCase) `
+        -or $newPrefix.StartsWith($oldPrefix, [System.StringComparison]::OrdinalIgnoreCase)
+}
+
 function Prompt-RemovePreviousInstallDir {
     param([string]$PreviousInstallDir)
     if (-not $PreviousInstallDir) {
@@ -723,7 +744,9 @@ function Main {
     }
 
     $previousInstallDir = Get-PreviousInstallDir
-    Prompt-RemovePreviousInstallDir -PreviousInstallDir $previousInstallDir
+    if ($previousInstallDir -and (Test-NestedInstallDir -OldDir $previousInstallDir -NewDir $InstallDir)) {
+        Write-Error-Exit "Previous Vite+ install at $previousInstallDir overlaps with VP_HOME $InstallDir. Choose a separate VP_HOME or remove the previous install first."
+    }
 
     # Suppress progress bars for cleaner output
     $ProgressPreference = 'SilentlyContinue'
@@ -951,6 +974,8 @@ exec "`$VP_HOME/current/bin/vp.exe" "`$@"
     # Setup Node.js version manager (shims) - separate component
     $nodeManagerResult = Setup-NodeManager -BinDir $BinDir
 
+    Prompt-RemovePreviousInstallDir -PreviousInstallDir $previousInstallDir
+
     # Use ~ shorthand if install dir is under USERPROFILE, otherwise show full path
     $displayDir = $InstallDir -replace [regex]::Escape($env:USERPROFILE), '~'
 

packages/cli/install.sh

@@ -146,6 +146,20 @@ normalize_existing_dir() {
   if [ -d "$dir" ]; then
     (cd "$dir" 2>/dev/null && pwd -P) || printf '%s\n' "$dir"
   else
+    local parent base parent_dir
+    parent="$(dirname "$dir")"
+    base="$(basename "$dir")"
+    if [ -d "$parent" ]; then
+      parent_dir="$(cd "$parent" 2>/dev/null && pwd -P)" || parent_dir=""
+      if [ -n "$parent_dir" ]; then
+        if [ "$parent_dir" = "/" ]; then
+          printf '/%s\n' "$base"
+        else
+          printf '%s/%s\n' "$parent_dir" "$base"
+        fi
+        return 0
+      fi
+    fi
     printf '%s\n' "$dir"
   fi
 }
@@ -198,6 +212,28 @@ detect_previous_install_dir() {
   printf '%s\n' "$old_dir"
 }
 
+is_nested_install_dir() {
+  [ -n "$1" ] && [ -n "$2" ] || return 1
+
+  local old_dir install_dir
+  old_dir="$(normalize_existing_dir "$1")"
+  install_dir="$(normalize_existing_dir "$2")"
+
+  [ "$old_dir" != "$install_dir" ] || return 1
+  if [ "$old_dir" = "/" ] || [ "$install_dir" = "/" ]; then
+    return 0
+  fi
+
+  case "$old_dir" in
+    "$install_dir"/*) return 0 ;;
+  esac
+  case "$install_dir" in
+    "$old_dir"/*) return 0 ;;
+  esac
+
+  return 1
+}
+
 prompt_remove_previous_install_dir() {
   local old_dir="$1"
   [ -n "$old_dir" ] || return 0
@@ -984,7 +1020,9 @@ main() {
 
   local previous_install_dir
   previous_install_dir="$(detect_previous_install_dir || true)"
-  prompt_remove_previous_install_dir "$previous_install_dir"
+  if [ -n "$previous_install_dir" ] && is_nested_install_dir "$previous_install_dir" "$INSTALL_DIR"; then
+    error "Previous Vite+ install at $previous_install_dir overlaps with VP_HOME $INSTALL_DIR. Choose a separate VP_HOME or remove the previous install first."
+  fi
 
   local platform
   platform=$(detect_platform)
@@ -1177,6 +1215,8 @@ WRAPPER_EOF
   # Setup Node.js version manager (shims) - separate component
   setup_node_manager "$BIN_DIR"
 
+  prompt_remove_previous_install_dir "$previous_install_dir"
+
   # Use ~ shorthand if install dir is under HOME, otherwise show full path
   local display_dir="${INSTALL_DIR/#$HOME/~}"
   local display_location="${display_dir}/bin"