From b20a82fb1a5e4a3a4dadfec099ec691048772fc3 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Tue, 29 Jun 2021 19:39:24 -0700 Subject: [PATCH] nsis installer now tested on windows --- .drone.yml | 1 + fetch-tor-win.ps1 | 4 ++-- windows/nsis/cwtch-installer.nsi | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 742d19a..8817f52 100644 --- a/.drone.yml +++ b/.drone.yml @@ -77,6 +77,7 @@ steps: - signtool sign /v /fd sha256 /a /f codesign.pfx /p $Env:pfx_pass /tr http://timestamp.digicert.com $Env:releasedir\cwtch.exe - copy windows\runner\resources\knot_128.ico $Env:releasedir\cwtch.ico - makensis windows\nsis\cwtch-installer.nsi + - move windows\nsis\cwtch-installer.exe cwtch-installer.exe - signtool sign /v /fd sha256 /a /f codesign.pfx /p $Env:pfx_pass /tr http://timestamp.digicert.com cwtch-installer.exe - powershell -command "(Get-FileHash cwtch-installer.exe -Algorithm sha512).Hash" > cwtch-installer.sha512 - mkdir deploy diff --git a/fetch-tor-win.ps1 b/fetch-tor-win.ps1 index dbfaf49..c293f26 100644 --- a/fetch-tor-win.ps1 +++ b/fetch-tor-win.ps1 @@ -1,6 +1,6 @@ -Invoke-WebRequest -Uri https://www.torproject.org/dist/torbrowser/10.0.16/tor-win32-0.4.5.7.zip -OutFile tor.zip +Invoke-WebRequest -Uri https://dist.torproject.org/torbrowser/10.0.18/tor-win64-0.4.5.9.zip -OutFile tor.zip -if ((Get-FileHash tor.zip -Algorithm sha512).Hash -ne '2b7d683f036d0fec149f1d2bdfcf5b7ef4c337005a2b685c056b00047fdb2b57d4c25b8559ad7ef5c7a030b273934be82a9f83ef6e391f5d7d13d8d6c83e8048' ) { Write-Error 'tor.zip sha512sum mismatch' } +if ((Get-FileHash tor.zip -Algorithm sha512).Hash -ne '72764eb07ad8ab511603aba0734951ca003989f5f4686af91ba220217b4a8a4bcc5f571b59f52c847932f6efedf847b111621983050fcddbb8099d43ca66fb07' ) { Write-Error 'tor.zip sha512sum mismatch' } Expand-Archive -Path tor.zip -DestinationPath Tor diff --git a/windows/nsis/cwtch-installer.nsi b/windows/nsis/cwtch-installer.nsi index 9169e70..684a0e3 100644 --- a/windows/nsis/cwtch-installer.nsi +++ b/windows/nsis/cwtch-installer.nsi @@ -78,7 +78,7 @@ Section # define what to install and place it in the output path # Filler for .sh to populate with contents of deploy/windows #FILESLISTSTART - FILE /r "../../build/windows/runner/Release/" + FILE /r "..\..\build\windows\runner\Release\" #FILESLISTEND