diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_config.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_config.bat index 3e069f7be..fe51a71d1 100755 --- a/scripts/windows/coco-dev-setup/batch/scripts/get_config.bat +++ b/scripts/windows/coco-dev-setup/batch/scripts/get_config.bat @@ -1,3 +1 @@ -call run_script ..\config\config.coco %2 %3 %4 %5 %6 > var.tmp -set /p %1= < var.tmp -del /q var.tmp \ No newline at end of file +call run_script .\get_var.ps1 ..\config\config.coco %1 \ No newline at end of file diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_download.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_download.bat index f952b44bc..d8c209f16 100755 --- a/scripts/windows/coco-dev-setup/batch/scripts/get_download.bat +++ b/scripts/windows/coco-dev-setup/batch/scripts/get_download.bat @@ -1,3 +1,3 @@ -powershell .\get_var.ps1 ..\\config\\downloads.coco %2 %3 %4 %5 %6 > var.tmp +call run_script .\get_var.ps1 ..\\config\\downloads.coco %2 %3 %4 %5 %6 > var.tmp set /p %1= < var.tmp del /q var.tmp \ No newline at end of file diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_text.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_text.bat index 971b952ca..33f75adf4 100755 --- a/scripts/windows/coco-dev-setup/batch/scripts/get_text.bat +++ b/scripts/windows/coco-dev-setup/batch/scripts/get_text.bat @@ -1,3 +1,3 @@ -powershell .\get_var.ps1 ..\\localisation\\%1.coco %3 %4 %5 %6 %7 > var.tmp +call run_script .\get_var.ps1 ..\\localisation\\%1.coco %3 %4 %5 %6 %7 > var.tmp set /p %2= < var.tmp del /q var.tmp \ No newline at end of file diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_var.ps1 b/scripts/windows/coco-dev-setup/batch/scripts/get_var.ps1 index 77573929f..91da095d5 100755 --- a/scripts/windows/coco-dev-setup/batch/scripts/get_var.ps1 +++ b/scripts/windows/coco-dev-setup/batch/scripts/get_var.ps1 @@ -1,17 +1,17 @@ $xml_file = [xml](get-content $args[0]) -if($args.count -eq 2) +if($args.count -eq 3) { - $xml_file.variables.($args[1]) -} -elseif($args.count -eq 3) -{ - $xml_file.variables.($args[1]).($args[2]) + cmd /c "set_var.bat" ($args[1]) ($xml_file.variables.($args[2])) } elseif($args.count -eq 4) { - $xml_file.variables.($args[1]).($args[2]).($args[3]) + cmd /c "set_var.bat" ($args[1]) ($xml_file.variables.($args[2]).($args[3])) } elseif($args.count -eq 5) { - $xml_file.variables.($args[1]).($args[2]).($args[3]).($args[4]) + cmd /c "set_var.bat" ($args[1]) ($xml_file.variables.($args[2]).($args[3]).($args[4])) +} +elseif($args.count -eq 6) +{ + cmd /c "set_var.bat" ($args[1]) ($xml_file.variables.($args[2]).($args[3]).($args[4]).($args[5])) } \ No newline at end of file diff --git a/scripts/windows/coco-dev-setup/batch/scripts/run_script.bat b/scripts/windows/coco-dev-setup/batch/scripts/run_script.bat index dfc6e6cc0..13e7d3032 100755 --- a/scripts/windows/coco-dev-setup/batch/scripts/run_script.bat +++ b/scripts/windows/coco-dev-setup/batch/scripts/run_script.bat @@ -1,2 +1 @@ -@echo off -powershell "& "%*" \ No newline at end of file +PowerShell -NoProfile -ExecutionPolicy Bypass -Command "& "%*" \ No newline at end of file diff --git a/scripts/windows/coco-dev-setup/batch/scripts/setup.bat b/scripts/windows/coco-dev-setup/batch/scripts/setup.bat index 3eb2b5fee..a5e4b61f7 100755 --- a/scripts/windows/coco-dev-setup/batch/scripts/setup.bat +++ b/scripts/windows/coco-dev-setup/batch/scripts/setup.bat @@ -7,9 +7,9 @@ mode con: cols=78 lines=55 call print_header call print_dashed_seperator -call get_config version version -call get_config author author -call get_config copyright copyright +call get_config.bat version +call get_config.bat author +call get_config.bat copyright echo Welcome to the automated Installation of the CodeCombat Dev. Environment! echo v%version% authored by %author% and published by %copyright%. call print_seperator diff --git a/scripts/windows/coco-dev-setup/last_step_succesfull/get_config.bat b/scripts/windows/coco-dev-setup/last_step_succesfull/get_config.bat index 6d079cefd..3849e22c2 100755 --- a/scripts/windows/coco-dev-setup/last_step_succesfull/get_config.bat +++ b/scripts/windows/coco-dev-setup/last_step_succesfull/get_config.bat @@ -1,4 +1,3 @@ -@ECHO off powershell .\get_var.ps1 config.coco %1 > var.tmp set /p %1= < var.tmp del /q var.tmp \ No newline at end of file