Powershell script update

walbourn · Nov 19, 2024 · 7c4643d · 7c4643d
1 parent 20106a6
commit 7c4643d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/VSIX/createcmake.ps1 b/VSIX/createcmake.ps1
@@ -66,15 +66,17 @@ param (
     [string]$targetdir = "$Env:USERPROFILE\source"
 )
 
-$templatedir = "..\" + $templatedir
+$reporoot = Split-Path -Path $PSScriptRoot -Parent
+
+$templatedir = Join-Path -Path $reporoot -ChildPath $templatedir
 
 $cmake = $templatedir + "\CMakeLists.txt"
 
 if (-not (Test-Path -Path $cmake)) {
     Write-Error -Message "ERROR: $templatedir does not contain a CMake" -ErrorAction Stop
 }
 
-$targetdir = $targetdir + "\" + $projectname
+$targetdir = Join-Path -Path $targetdir -ChildPath $projectname
 
 if (Test-Path $targetdir) {
     Write-Error -Message "ERROR: Project directory already exists" -ErrorAction Stop

diff --git a/VSIX/createmsbuild.ps1 b/VSIX/createmsbuild.ps1
@@ -83,9 +83,11 @@ if (-Not ($platformtoolset -match 'v[0-9][0-9][0-9]'))
     Write-Error -Message "ERROR: Invalid platform toolset" -ErrorAction Stop
 }
 
-$templatedir = "..\" + $templatedir
+$reporoot = Split-Path -Path $PSScriptRoot -Parent
 
-$targetdir = $targetdir + "\" + $projectname
+$templatedir = Join-Path -Path $reporoot -ChildPath $templatedir
+
+$targetdir = Join-Path -Path $targetdir -ChildPath $projectname
 
 if (Test-Path $targetdir) {
     Write-Error -Message "ERROR: Project directory already exists" -ErrorAction Stop