Fix crash issue when scripts are running under a path with special characters

10 files changed, 14 insertions, 16 deletions

diff --git a/MAS/All-In-One-Version-KL/MAS_AIO.cmd b/MAS/All-In-One-Version-KL/MAS_AIO.cmd
index f180db7..4eb0dce 100644
--- a/MAS/All-In-One-Version-KL/MAS_AIO.cmd
+++ b/MAS/All-In-One-Version-KL/MAS_AIO.cmd
@@ -154,7 +154,6 @@ goto dk_done
 

 set "_work=%~dp0"

 if "%_work:~-1%"=="\" set "_work=%_work:~0,-1%"

-set "_workp=%_work:'=''%"

 

 set "_batf=%~f0"

 set "_batp=%_batf:'=''%"

@@ -197,7 +196,7 @@ goto dk_done
 

 ::pstst $ExecutionContext.SessionState.LanguageMode :pstst

 

-for /f "delims=" %%a in ('cmd /c "%psc% ""if ($PSVersionTable.PSEdition -ne 'Core') {$f=[io.file]::ReadAllText('!_batp!') -split ':pstst';iex ($f[1])}""" %nul6%') do (set tstresult=%%a)

+for /f "delims=" %%a in ('%psc% "if ($PSVersionTable.PSEdition -ne 'Core') {$f=[io.file]::ReadAllText('!_batp!') -split ':pstst';iex ($f[1])}" %nul6%') do (set tstresult=%%a)

 

 if /i not "%tstresult%"=="FullLanguage" (

 %eline%

@@ -9733,9 +9732,9 @@ namespace LibTSforge.PhysicalStore
 }

 '@

 $ErrorActionPreference = 'Stop'

-$binPath = Join-Path -Path $env:_workp -ChildPath "BIN\LibTSforge.dll"

+$binPath = "$env:_work\BIN\LibTSforge.dll"

 

-if (Test-Path -Path $binPath) {

+if (Test-Path -LiteralPath $binPath) {

     Write-Host "LibTSforge.dll found in BIN folder. Loading the DLL..."

     Add-Type -Path $binPath

 }

diff --git a/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd b/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd
index 8f65bbd..bb694f4 100644
--- a/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd
@@ -235,7 +235,7 @@ goto dk_done
 

 ::pstst $ExecutionContext.SessionState.LanguageMode :pstst

 

-for /f "delims=" %%a in ('cmd /c "%psc% ""if ($PSVersionTable.PSEdition -ne 'Core') {$f=[io.file]::ReadAllText('!_batp!') -split ':pstst';iex ($f[1])}""" %nul6%') do (set tstresult=%%a)

+for /f "delims=" %%a in ('%psc% "if ($PSVersionTable.PSEdition -ne 'Core') {$f=[io.file]::ReadAllText('!_batp!') -split ':pstst';iex ($f[1])}" %nul6%') do (set tstresult=%%a)

 

 if /i not "%tstresult%"=="FullLanguage" (

 %eline%

diff --git a/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd b/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd
index bcac266..206ac83 100644
--- a/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd
@@ -238,7 +238,7 @@ goto dk_done
 

 ::pstst $ExecutionContext.SessionState.LanguageMode :pstst

 

-for /f "delims=" %%a in ('cmd /c "%psc% ""if ($PSVersionTable.PSEdition -ne 'Core') {$f=[io.file]::ReadAllText('!_batp!') -split ':pstst';iex ($f[1])}""" %nul6%') do (set tstresult=%%a)

+for /f "delims=" %%a in ('%psc% "if ($PSVersionTable.PSEdition -ne 'Core') {$f=[io.file]::ReadAllText('!_batp!') -split ':pstst';iex ($f[1])}" %nul6%') do (set tstresult=%%a)

 

 if /i not "%tstresult%"=="FullLanguage" (

 %eline%

diff --git a/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd b/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd
index 04b78db..6de8e0c 100644
--- a/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd
+++ b/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd
@@ -228,7 +228,7 @@ goto dk_done
 

 ::pstst $ExecutionContext.SessionState.LanguageMode :pstst

 

-for /f "delims=" %%a in ('cmd /c "%psc% ""if ($PSVersionTable.PSEdition -ne 'Core') {$f=[io.file]::ReadAllText('!_batp!') -split ':pstst';iex ($f[1])}""" %nul6%') do (set tstresult=%%a)

+for /f "delims=" %%a in ('%psc% "if ($PSVersionTable.PSEdition -ne 'Core') {$f=[io.file]::ReadAllText('!_batp!') -split ':pstst';iex ($f[1])}" %nul6%') do (set tstresult=%%a)

 

 if /i not "%tstresult%"=="FullLanguage" (

 %eline%

diff --git a/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd b/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd
index d8759e2..9f4bed2 100644
--- a/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd
@@ -257,7 +257,7 @@ goto dk_done
 

 ::pstst $ExecutionContext.SessionState.LanguageMode :pstst

 

-for /f "delims=" %%a in ('cmd /c "%psc% ""if ($PSVersionTable.PSEdition -ne 'Core') {$f=[io.file]::ReadAllText('!_batp!') -split ':pstst';iex ($f[1])}""" %nul6%') do (set tstresult=%%a)

+for /f "delims=" %%a in ('%psc% "if ($PSVersionTable.PSEdition -ne 'Core') {$f=[io.file]::ReadAllText('!_batp!') -split ':pstst';iex ($f[1])}" %nul6%') do (set tstresult=%%a)

 

 if /i not "%tstresult%"=="FullLanguage" (

 %eline%

diff --git a/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd b/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd
index 350ae2a..ebc1399 100644
--- a/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd
@@ -221,7 +221,6 @@ goto dk_done
 

 set "_work=%~dp0"

 if "%_work:~-1%"=="\" set "_work=%_work:~0,-1%"

-set "_workp=%_work:'=''%"

 

 set "_batf=%~f0"

 set "_batp=%_batf:'=''%"

@@ -264,7 +263,7 @@ goto dk_done
 

 ::pstst $ExecutionContext.SessionState.LanguageMode :pstst

 

-for /f "delims=" %%a in ('cmd /c "%psc% ""if ($PSVersionTable.PSEdition -ne 'Core') {$f=[io.file]::ReadAllText('!_batp!') -split ':pstst';iex ($f[1])}""" %nul6%') do (set tstresult=%%a)

+for /f "delims=" %%a in ('%psc% "if ($PSVersionTable.PSEdition -ne 'Core') {$f=[io.file]::ReadAllText('!_batp!') -split ':pstst';iex ($f[1])}" %nul6%') do (set tstresult=%%a)

 

 if /i not "%tstresult%"=="FullLanguage" (

 %eline%

@@ -7616,9 +7615,9 @@ namespace LibTSforge.PhysicalStore
 }

 '@

 $ErrorActionPreference = 'Stop'

-$binPath = Join-Path -Path $env:_workp -ChildPath "BIN\LibTSforge.dll"

+$binPath = "$env:_work\BIN\LibTSforge.dll"

 

-if (Test-Path -Path $binPath) {

+if (Test-Path -LiteralPath $binPath) {

     Write-Host "LibTSforge.dll found in BIN folder. Loading the DLL..."

     Add-Type -Path $binPath

 }

diff --git a/MAS/Separate-Files-Version/Change_Office_Edition.cmd b/MAS/Separate-Files-Version/Change_Office_Edition.cmd
index 264a58e..708689b 100644
--- a/MAS/Separate-Files-Version/Change_Office_Edition.cmd
+++ b/MAS/Separate-Files-Version/Change_Office_Edition.cmd
@@ -188,7 +188,7 @@ goto dk_done
 

 ::pstst $ExecutionContext.SessionState.LanguageMode :pstst

 

-for /f "delims=" %%a in ('cmd /c "%psc% ""if ($PSVersionTable.PSEdition -ne 'Core') {$f=[io.file]::ReadAllText('!_batp!') -split ':pstst';iex ($f[1])}""" %nul6%') do (set tstresult=%%a)

+for /f "delims=" %%a in ('%psc% "if ($PSVersionTable.PSEdition -ne 'Core') {$f=[io.file]::ReadAllText('!_batp!') -split ':pstst';iex ($f[1])}" %nul6%') do (set tstresult=%%a)

 

 if /i not "%tstresult%"=="FullLanguage" (

 %eline%

diff --git a/MAS/Separate-Files-Version/Change_Windows_Edition.cmd b/MAS/Separate-Files-Version/Change_Windows_Edition.cmd
index 37b02c1..594f857 100644
--- a/MAS/Separate-Files-Version/Change_Windows_Edition.cmd
+++ b/MAS/Separate-Files-Version/Change_Windows_Edition.cmd
@@ -193,7 +193,7 @@ goto dk_done
 

 ::pstst $ExecutionContext.SessionState.LanguageMode :pstst

 

-for /f "delims=" %%a in ('cmd /c "%psc% ""if ($PSVersionTable.PSEdition -ne 'Core') {$f=[io.file]::ReadAllText('!_batp!') -split ':pstst';iex ($f[1])}""" %nul6%') do (set tstresult=%%a)

+for /f "delims=" %%a in ('%psc% "if ($PSVersionTable.PSEdition -ne 'Core') {$f=[io.file]::ReadAllText('!_batp!') -split ':pstst';iex ($f[1])}" %nul6%') do (set tstresult=%%a)

 

 if /i not "%tstresult%"=="FullLanguage" (

 %eline%

diff --git a/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd b/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd
index df142d4..34ba8d0 100644
--- a/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd
+++ b/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd
@@ -187,7 +187,7 @@ goto done2
 

 ::pstst $ExecutionContext.SessionState.LanguageMode :pstst

 

-for /f "delims=" %%a in ('cmd /c "%psc% ""if ($PSVersionTable.PSEdition -ne 'Core') {$f=[io.file]::ReadAllText('!_batp!') -split ':pstst';iex ($f[1])}""" %nul6%') do (set tstresult=%%a)

+for /f "delims=" %%a in ('%psc% "if ($PSVersionTable.PSEdition -ne 'Core') {$f=[io.file]::ReadAllText('!_batp!') -split ':pstst';iex ($f[1])}" %nul6%') do (set tstresult=%%a)

 

 if /i not "%tstresult%"=="FullLanguage" (

 %eline%

diff --git a/MAS/Separate-Files-Version/Troubleshoot.cmd b/MAS/Separate-Files-Version/Troubleshoot.cmd
index 483f6da..487b496 100644
--- a/MAS/Separate-Files-Version/Troubleshoot.cmd
+++ b/MAS/Separate-Files-Version/Troubleshoot.cmd
@@ -188,7 +188,7 @@ goto dk_done
 

 ::pstst $ExecutionContext.SessionState.LanguageMode :pstst

 

-for /f "delims=" %%a in ('cmd /c "%psc% ""if ($PSVersionTable.PSEdition -ne 'Core') {$f=[io.file]::ReadAllText('!_batp!') -split ':pstst';iex ($f[1])}""" %nul6%') do (set tstresult=%%a)

+for /f "delims=" %%a in ('%psc% "if ($PSVersionTable.PSEdition -ne 'Core') {$f=[io.file]::ReadAllText('!_batp!') -split ':pstst';iex ($f[1])}" %nul6%') do (set tstresult=%%a)

 

 if /i not "%tstresult%"=="FullLanguage" (

 %eline%