diff --git a/ScenarioMaker/ScenarioMaker.cmd b/ScenarioMaker/ScenarioMaker.cmd index 6c90984..48c0362 100644 --- a/ScenarioMaker/ScenarioMaker.cmd +++ b/ScenarioMaker/ScenarioMaker.cmd @@ -1,7 +1,7 @@ @echo off pushd %~dp0 -if exist ..\python_embed\python.exe ( - ..\python_embed\python.exe ScenarioMaker.pyw %* +if exist ..\downloads\python_embed\python.exe ( + ..\downloads\python_embed\python.exe ScenarioMaker.pyw %* ) else ( python ScenarioMaker.pyw %* ) diff --git a/setup_src/src_host/host_setup.ps1 b/setup_src/src_host/host_setup.ps1 index 736cade..17f7932 100644 --- a/setup_src/src_host/host_setup.ps1 +++ b/setup_src/src_host/host_setup.ps1 @@ -134,10 +134,10 @@ if ($framework) { if (-not (Test-Path "$PSScriptRoot\..\..\downloads\ffmpeg_win64")) { Invoke-WebRequest -Uri $ffmpegUrl -OutFile $ffmpegZip 2>&1 | log checkCmd($?) - sleep 1s # Wait a bit to ensure file is fully written before expanding + start-sleep -seconds 1 # Wait a bit to ensure file is fully written before expanding Expand-Archive -Path $ffmpegZip -DestinationPath "$PSScriptRoot\..\..\downloads" -Force 2>&1 | log checkCmd($?) - sleep 2s # Wait a bit to ensure all file handles are released before moving/deleting + start-sleep -seconds 2 # Wait a bit to ensure all file handles are released before moving/deleting Move-Item "$PSScriptRoot\..\..\downloads\ffmpeg-N-123073-g743df5ded9-win64-gpl" "$PSScriptRoot\..\..\downloads\ffmpeg_win64" -Force 2>&1 | log Remove-Item $ffmpegZip 2>&1 | log }