From 51069bae648e218e9ac6f3346662243db42a2001 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Mon, 19 Aug 2019 08:44:57 +0000 Subject: quickinstall: deal with paths better Signed-off-by: Jason A. Donenfeld --- quickinstall.bat | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'quickinstall.bat') diff --git a/quickinstall.bat b/quickinstall.bat index 9d5e100f..9765fdb0 100644 --- a/quickinstall.bat +++ b/quickinstall.bat @@ -1,17 +1,16 @@ @echo off rem SPDX-License-Identifier: MIT -rem rem Copyright (C) 2019 WireGuard LLC. All Rights Reserved. +rem Copyright (C) 2019 WireGuard LLC. All Rights Reserved. +setlocal +cd /d %~dp0 || exit /b 1 echo [+] Building wireguard.exe call .\build.bat || exit /b 1 echo [+] Building installer -cd .\installer -call .\build.bat || exit /b 1 +call .\installer\build.bat || exit /b 1 echo [+] Uninstalling old versions for /f %%a in ('reg query HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall /s /d /c /e /f WireGuard ^| findstr CurrentVersion\Uninstall') do msiexec /qb /x %%~na echo [+] Installing new version -for /f "tokens=3" %%a in ('findstr /r "WIREGUARD_WINDOWS_VERSION_STRING.*[0-9.]*" ..\version.h') do set WIREGUARD_VERSION=%%a +for /f "tokens=3" %%a in ('findstr /r "WIREGUARD_WINDOWS_VERSION_STRING.*[0-9.]*" .\version.h') do set WIREGUARD_VERSION=%%a set WIREGUARD_VERSION=%WIREGUARD_VERSION:"=% -cd .\dist -msiexec /qb /i wireguard-amd64-%WIREGUARD_VERSION%.msi -cd ..\.. +msiexec /qb /i installer\dist\wireguard-%PROCESSOR_ARCHITECTURE%-%WIREGUARD_VERSION%.msi -- cgit v1.2.3-59-g8ed1b