Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ScenarioMaker/ScenarioMaker.cmd
Original file line number Diff line number Diff line change
@@ -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 %*
)
4 changes: 2 additions & 2 deletions setup_src/src_host/host_setup.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
Loading