mirror of
https://github.com/QB64Official/qb64.git
synced 2024-05-12 12:00:14 +00:00
Finally got the ARCH stuff working
Arch discovery needed to be outside the test for errorlevel
This commit is contained in:
parent
1205b2abf0
commit
786c050bbf
9
findcurl.cmd
Normal file → Executable file
9
findcurl.cmd
Normal file → Executable file
|
@ -8,18 +8,18 @@ rem It also assumes that curl is downloaded to the users Desktop
|
||||||
set DLPAGE=http://skanthak.homepage.t-online.de/download
|
set DLPAGE=http://skanthak.homepage.t-online.de/download
|
||||||
set CURLVERSION=curl-7.64.1.cab
|
set CURLVERSION=curl-7.64.1.cab
|
||||||
set LINK=%DLPAGE%/%CURLVERSION%
|
set LINK=%DLPAGE%/%CURLVERSION%
|
||||||
rem Check if curl exists
|
rem grab the arch. We'll need this to extract files.
|
||||||
|
reg Query "HKLM\Hardware\Description\System\CentralProcessor\0" | find /i "x86" > NUL && set ARCH=i386|| set ARCH=amd64
|
||||||
|
|
||||||
|
rem Check if curl exists
|
||||||
curl --version 2>NUL 1>&2
|
curl --version 2>NUL 1>&2
|
||||||
|
|
||||||
|
|
||||||
if %ERRORLEVEL == 9009 (
|
if %ERRORLEVEL == 9009 (
|
||||||
mkdir internal\curl >NUL
|
mkdir internal\curl >NUL
|
||||||
echo Fetching %LINK%
|
echo Fetching %LINK%
|
||||||
explorer %LINK%
|
explorer %LINK%
|
||||||
|
|
||||||
rem grab the arch. We'll need this to extract files.
|
|
||||||
reg Query "HKLM\Hardware\Description\System\CentralProcessor\0" | find /i "x86" > NUL && set ARCH=i386|| set ARCH=amd64
|
|
||||||
|
|
||||||
rem we should wait until the file is downloaded, because explorer returns straight away
|
rem we should wait until the file is downloaded, because explorer returns straight away
|
||||||
"%SystemRoot%\system32\expand.exe" "%USERPROFILE%\Desktop\%CURLVERSION%" /F:%ARCH%\* internal\curl
|
"%SystemRoot%\system32\expand.exe" "%USERPROFILE%\Desktop\%CURLVERSION%" /F:%ARCH%\* internal\curl
|
||||||
|
|
||||||
|
@ -28,4 +28,3 @@ if %ERRORLEVEL == 9009 (
|
||||||
) ELSE (
|
) ELSE (
|
||||||
echo "Found curl, continuing"
|
echo "Found curl, continuing"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue