FIX: which which -> which destination

For the case when a third-party `which` is available. Used to ensure that `utils` in %PATH%.
reksar · Oct 25, 2023 · 8bf2f8c · 8bf2f8c
1 parent aa3eeed
commit 8bf2f8c
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 6 deletions.
diff --git a/get-sdk.bat b/get-sdk.bat
@@ -12,7 +12,7 @@ rem  --------------------------------------------------------------------------
 
 setlocal
 
-call which which >NUL 2>&1 || set "PATH=%~dp0utils;%PATH%"
+call which destination >NUL 2>&1 || set "PATH=%~dp0utils;%PATH%"
 call which check-components >NUL 2>&1 || set "PATH=%~dp0sdk;%PATH%"
 
 set url=%~1

diff --git a/get-vsix.bat b/get-vsix.bat
@@ -12,7 +12,7 @@ rem  --------------------------------------------------------------------------
 
 setlocal
 
-call which which >NUL 2>&1 || set "PATH=%~dp0utils;%PATH%"
+call which destination >NUL 2>&1 || set "PATH=%~dp0utils;%PATH%"
 
 set url=%~1
 call destination "%~2" || exit /b 1

diff --git a/sdk/extract-components.bat b/sdk/extract-components.bat
@@ -53,6 +53,7 @@ for %%i in ("%installers%\*.msi") do (
     echo -   %%~ni
     lessmsi x "%%i" >> lessmsi.log || (
       echo [ERR][%~n0] Unable to extract SDK Component!
+      echo [INFO][%~n0] See "%components%\lessmsi.log".
       cd /d "%origin_path%"
       exit /b 3
     )

diff --git a/utils/download.bat b/utils/download.bat
@@ -24,7 +24,7 @@ if exist "%outfile%" (
 )
 
 rem  Utility preset.
-call which which >NUL 2>&1 || set "PATH=%root%;%PATH%"
+call which destination >NUL 2>&1 || set "PATH=%root%;%PATH%"
 
 rem  Ensure the %outfile% dir exists.
 for %%i in ("%outfile%") do if not exist "%%~dpi" md "%%~dpi"

diff --git a/utils/ensure-lessmsi.bat b/utils/ensure-lessmsi.bat
@@ -19,7 +19,7 @@ set LESSMSI_DOWNLOAD=https://github.com/activescott/lessmsi/releases/download
 set LESSMSI_URL=%LESSMSI_DOWNLOAD%/%LESSMSI_VER%/%LESSMSI_ZIP%
 
 rem  Abs path expected!
-call which which >NUL 2>&1 || set "PATH=%~dp0;%PATH%"
+call which destination >NUL 2>&1 || set "PATH=%~dp0;%PATH%"
 call destination "%~1" || exit /b 1
 
 echo.

diff --git a/utils/unzip.bat b/utils/unzip.bat
@@ -5,7 +5,7 @@ setlocal
 set zip=%~1
 set destination=%~2
 
-call which which >NUL 2>&1 || set "PATH=%~dp0;%PATH%"
+call which destination >NUL 2>&1 || set "PATH=%~dp0;%PATH%"
 
 call which 7z >NUL 2>&1 && (
   7z x -y -o"%destination%" "%zip%" >NUL || exit /b 1

diff --git a/vsget.bat b/vsget.bat
@@ -19,11 +19,12 @@ set MSBUILD_GROUP=msbuild-x64.%MSBUILD_V%
 rem  Windows SDK v10.0.22621.755
 set SDK_URL=https://go.microsoft.com/fwlink/?linkid=2196240
 
+rem  VC Vars for Host x64 and Platform x64
 set VCVARS=vcvars-x64-x64
 
 set root=%~dp0
 
-call which which >NUL 2>&1 || set "PATH=%root%utils;%PATH%"
+call which destination >NUL 2>&1 || set "PATH=%root%utils;%PATH%"
 call which get-vsix-group >NUL 2>&1 || set "PATH=%root%;%PATH%"
 
 call destination "%~1" || exit /b 1