Skip to content
Snippets Groups Projects
Unverified Commit 2231cce1 authored by meskio's avatar meskio :tent:
Browse files

[pkg] Rename the missing pieces to bitmask-vpn

It fixes the windows build.
parent f0823c44
No related branches found
No related tags found
1 merge request!19[pkg] Rename the missing pieces to bitmask-vpn
......@@ -58,7 +58,7 @@ Windows
We build a windows installer for RiseupVPN, using nsis. For testing, you can find the `snap artifact`_ for the latest build in the master branch in the CI. We publish the `latest stable windows installer`_, as well as `windows pre-releases`_.
.. _`snap artifact`: https://0xacab.org/leap/bitmask-systray/-/jobs/artifacts/master/download?job=win_installer
.. _`snap artifact`: https://0xacab.org/leap/bitmask-vpn/-/jobs/artifacts/master/download?job=win_installer
.. _`latest stable windows installer`: https://downloads.leap.se/RiseupVPN/windows/RiseupVPN-win-latest.exe
.. _`windows pre-releases`: https://downloads.leap.se/RiseupVPN/windows/beta/
......@@ -129,7 +129,7 @@ If you want to contribute to BitmaskLite/RiseupVPN, you can get in contact with
You might also want to have a look at some related pieces that are used to build these packages.
* `bitmask-systray`_: this is the golang implementation of RiseupVPN. It is
* `bitmask-vpn`_: this is the golang implementation of RiseupVPN. It is
basically a wrapper around openvpn, with knowledge of what configuration
files are expected to exist in a LEAP provider. The only user interface is a minimalistic systray that uses libappindicator.
* `the bitmask helper`_: it lives in this repo. It implements a long-lived helper that runs with administrative privileges, used in OSX and Windows for launching openvpn and the firewall. In OSX it is run as a LaunchDaemon, and in Windows we use nssm to run this helper. It communicates with BitmaskLite via a local http service.
......@@ -137,6 +137,6 @@ You might also want to have a look at some related pieces that are used to build
In case you are wondering what is the relationship of BitmaskLite and the regular Bitmask, it is planned that the bitmask client will at some point switch to use the same helpers. This repo probably will be turned into a generic packaging and helper tool to be used for both branded builds of BitmaskLite, and packaging of the frozen python payloads generated from bitmask-dev.
.. _`bitmask-systray`: https://0xacab.org/leap/bitmask-systray
.. _`bitmask-vpn`: https://0xacab.org/leap/bitmask-vpn
.. _`the bitmask helper`: https://0xacab.org/leap/riseup_vpn/tree/master/helper
.. _`bitmask-root`: https://0xacab.org/leap/bitmask-dev/blob/master/src/leap/bitmask/vpn/helpers/linux/bitmask-root
..\staging\bitmask_helper.exe
..\staging\bitmask-systray.exe
..\staging\bitmask-vpn.exe
..\staging\libcrypto-1_1-x64.dll
..\staging\liblzo2-2.dll
..\staging\libpkcs11-helper-1.dll
......
......@@ -9,5 +9,5 @@ libcrypto-1_1-x64.dll
libssl-1_1-x64.dll
padlock.dll
bitmask_helper.exe
bitmask-systray.exe
bitmask-vpn.exe
tap-windows.exe
......@@ -48,7 +48,7 @@ RequestExecutionLevel admin
Section "InstallFiles"
; first we try to delete the systray, locked by the app.
ClearErrors
Delete 'C:\Program Files\$app_name\bitmask-systray.exe'
Delete 'C:\Program Files\$app_name\bitmask-vpn.exe'
IfErrors 0 noError
; Error handling
......@@ -75,7 +75,7 @@ Section "InstallFiles"
;Start Menu
createDirectory "$SMPROGRAMS\$app_name\"
createShortCut "$SMPROGRAMS\$app_name\$app_name.lnk" "$INSTDIR\bitmask-systray.exe" "" "$INSTDIR\$app_name_lower.ico"
createShortCut "$SMPROGRAMS\$app_name\$app_name.lnk" "$INSTDIR\bitmask-vpn.exe" "" "$INSTDIR\$app_name_lower.ico"
File "readme.txt"
File "..\staging\nssm.exe"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment