aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2019-08-19 08:44:57 +0000
committerJason A. Donenfeld <Jason@zx2c4.com>2019-08-19 11:35:47 +0200
commit4187947bad1b86149664cd5cfd370925868dc340 (patch)
tree9d3d4ac59219db2a3e1fe17570336844af69f3c9
parentmod: update dependencies (diff)
downloadwireguard-windows-4187947bad1b86149664cd5cfd370925868dc340.tar.xz
wireguard-windows-4187947bad1b86149664cd5cfd370925868dc340.zip
quickinstall: deal with paths better
-rw-r--r--quickinstall.bat13
1 files changed, 6 insertions, 7 deletions
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