Merge pull request #9 from moja-global/feature/installer-sync-2026-03-21

Simpleshell3 · web-flow · commit 9e5507021a79 · 2026-03-25T15:33:24.000+01:00
Fix installer path rewrite for repeated component names
diff --git a/installer/fix_paths.ps1 b/installer/fix_paths.ps1
@@ -33,8 +33,11 @@ function Resolve-OldBasePath {
     )
 
     foreach ($name in $componentNames) {
-        $pattern = "(?<base>[A-Za-z]:\\[^`r`n]+?)\\$name(\\|/)"
-        $match = [regex]::Match($Text, $pattern)
+        $escapedName = [regex]::Escape($name)
+        # Use a greedy base match so repeated folder names (e.g. gcbm_view\gcbm_view\gcbm_view)
+        # resolve to the deepest workspace base path before the component folder.
+        $pattern = "(?<base>[A-Za-z]:\\[^`r`n]+)\\$escapedName(?=\\|/)"
+        $match = [regex]::Match($Text, $pattern, [System.Text.RegularExpressions.RegexOptions]::IgnoreCase)
         if ($match.Success) {
             return $match.Groups["base"].Value.TrimEnd('\')
         }

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,11 @@ function Resolve-OldBasePath {`
`33`	`33`	`)`
`34`	`34`
`35`	`35`	`foreach ($name in $componentNames) {`
`36`		- $pattern = "(?<base>[A-Za-z]:\\[^`r`n]+?)\\$name(\\\|/)"
`37`		`- $match = [regex]::Match($Text, $pattern)`
	`36`	`+ $escapedName = [regex]::Escape($name)`
	`37`	`+ # Use a greedy base match so repeated folder names (e.g. gcbm_view\gcbm_view\gcbm_view)`
	`38`	`+ # resolve to the deepest workspace base path before the component folder.`
	`39`	+ $pattern = "(?<base>[A-Za-z]:\\[^`r`n]+)\\$escapedName(?=\\\|/)"
	`40`	`+ $match = [regex]::Match($Text, $pattern, [System.Text.RegularExpressions.RegexOptions]::IgnoreCase)`
`38`	`41`	`if ($match.Success) {`
`39`	`42`	`return $match.Groups["base"].Value.TrimEnd('\')`
`40`	`43`	`}`