install_script: Fix copying of downloaded yasm exectuable.

Fixes #5

Author: Sibras

install_script.bat

@@ -288,18 +288,18 @@ if %ERRORLEVEL% neq 0 (
 REM Check if a yasm binary was bundled
 if exist "%SCRIPTDIR%\yasm\" (
     REM Use the bundled binaries
-    copy /B /Y /V "%SCRIPTDIR%\yasm\yasm-%SYSARCH%.exe" "%SCRIPTDIR%\yasm.exe" >nul 2>&1
+    copy /B /Y /V "%SCRIPTDIR%\yasm\yasm-%SYSARCH%.exe" "%SCRIPTDIR%\yasm-%SYSARCH%.exe" >nul 2>&1
     goto InstallYASM
-) else if exist "%SCRIPTDIR%\yasm_%YASMVERSION%.zip" (
-    echo Using existing NASM binary...
+) else if exist "%SCRIPTDIR%\yasm_%YASMVERSION%_win%SYSARCH%.exe" (
+    echo Using existing YASM binary...
     goto InstallNASM
 )
 
 REM Download the latest yasm binary for windows goto Terminate
 echo Downloading required YASM release binary...
 set YASMDOWNLOAD=%YASMDL%/yasm-%YASMVERSION%-win%SYSARCH%.exe
-powershell.exe -Command (New-Object Net.WebClient).DownloadFile('%YASMDOWNLOAD%', '%SCRIPTDIR%\yasm_%YASMVERSION%.exe') >nul 2>&1
-if not exist "%SCRIPTDIR%\yasm_%YASMVERSION%.exe" (
+powershell.exe -Command (New-Object Net.WebClient).DownloadFile('%YASMDOWNLOAD%', '%SCRIPTDIR%\yasm_%YASMVERSION%_win%SYSARCH%.exe') >nul 2>&1
+if not exist "%SCRIPTDIR%\yasm_%YASMVERSION%_win%SYSARCH%.exe" (
     echo Error: Failed to download required YASM binary!
     echo    The following link could not be resolved "%YASMDOWNLOAD%"
     goto Terminate
@@ -309,14 +309,14 @@ if not exist "%SCRIPTDIR%\yasm_%YASMVERSION%.exe" (
 REM copy yasm executable to VC installation folder
 echo Installing required YASM release binary...
 del /F /Q "%VCINSTALLDIR%\yasm.exe" >nul 2>&1
-copy /B /Y /V "%SCRIPTDIR%\yasm.exe" "%VCINSTALLDIR%\" >nul 2>&1
+copy /B /Y /V "%SCRIPTDIR%\yasm*.exe" "%VCINSTALLDIR%\" >nul 2>&1
 if %ERRORLEVEL% neq 0 (
     echo Error: Failed to install YASM binary!
     echo    Ensure that this script is run in a shell with the necessary write privileges
-    del /F /Q "%SCRIPTDIR%\yasm.exe"  >nul 2>&1
+    del /F /Q "%SCRIPTDIR%\yasm*.exe"  >nul 2>&1
     goto Terminate
 )
-del /F /Q "%SCRIPTDIR%\yasm.exe"  >nul 2>&1
+del /F /Q "%SCRIPTDIR%\yasm*.exe"  >nul 2>&1
 echo Finished Successfully
 goto Exit