From 786c050bbffe64a36a797e262974b57367db9ed8 Mon Sep 17 00:00:00 2001 From: brickviking Date: Fri, 26 Aug 2022 02:00:21 +1200 Subject: [PATCH] Finally got the ARCH stuff working Arch discovery needed to be outside the test for errorlevel --- findcurl.cmd | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) mode change 100644 => 100755 findcurl.cmd diff --git a/findcurl.cmd b/findcurl.cmd old mode 100644 new mode 100755 index 73ac8a601..54673b32e --- a/findcurl.cmd +++ b/findcurl.cmd @@ -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 CURLVERSION=curl-7.64.1.cab 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 + if %ERRORLEVEL == 9009 ( mkdir internal\curl >NUL echo Fetching %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 "%SystemRoot%\system32\expand.exe" "%USERPROFILE%\Desktop\%CURLVERSION%" /F:%ARCH%\* internal\curl @@ -28,4 +28,3 @@ if %ERRORLEVEL == 9009 ( ) ELSE ( echo "Found curl, continuing" ) -