summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2019-02-21 12:55:53 +0100
committerRuben Pollan <meskio@sindominio.net>2019-02-21 12:56:10 +0100
commit14709c4e201d210c7b967dde97b65eeafd3676c2 (patch)
tree7fe69195f9162568719243dfcea2fddbea29c514
parent18b3fd722ddf80ef217148b132fb26806f505aca (diff)
[pkg] Make the icon brandable
-rw-r--r--snap/gui/icon.svg (renamed from snap/gui/riseupvpn.svg)0
-rw-r--r--snap/snapcraft.yaml2
-rwxr-xr-xwin/payload/uninstall2
-rwxr-xr-xwin/template.nsi6
4 files changed, 5 insertions, 5 deletions
diff --git a/snap/gui/riseupvpn.svg b/snap/gui/icon.svg
index a19c6c6..a19c6c6 100644
--- a/snap/gui/riseupvpn.svg
+++ b/snap/gui/icon.svg
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 53d82d4..acc471d 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -10,7 +10,7 @@ description: |
grade: stable
confinement: classic
-icon: snap/gui/riseupvpn.svg
+icon: snap/gui/icon.svg
parts:
desktop-gtk3:
diff --git a/win/payload/uninstall b/win/payload/uninstall
index e813b13..7c7df24 100755
--- a/win/payload/uninstall
+++ b/win/payload/uninstall
@@ -1,4 +1,4 @@
-riseupvpn.ico
+icon.ico
openssl.exe
openvpn.exe
ssleay32.dll
diff --git a/win/template.nsi b/win/template.nsi
index beb4dc2..cbf44d8 100755
--- a/win/template.nsi
+++ b/win/template.nsi
@@ -66,7 +66,7 @@ Section "InstallFiles"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\$app_name_lower" "DisplayName" "$app_name"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\$app_name_lower" "UninstallString" '"$INSTDIR\uninstall.exe"'
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\$app_name_lower" "InstallLocation" "$INSTDIR"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\$app_name_lower" "DisplayIcon" "$INSTDIR\$app_name_lower.ico"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\$app_name_lower" "DisplayIcon" "$INSTDIR\icon.ico"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\$app_name_lower" "Readme" "$INSTDIR\readme.txt"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\$app_name_lower" "DisplayVersion" "$version"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\$app_name_lower" "Publisher" "LEAP Encryption Access Project"
@@ -75,11 +75,11 @@ Section "InstallFiles"
;Start Menu
createDirectory "$SMPROGRAMS\$app_name\"
- createShortCut "$SMPROGRAMS\$app_name\$app_name.lnk" "$INSTDIR\bitmask-vpn.exe" "" "$INSTDIR\$app_name_lower.ico"
+ createShortCut "$SMPROGRAMS\$app_name\$app_name.lnk" "$INSTDIR\bitmask-vpn.exe" "" "$INSTDIR\icon.ico"
File "readme.txt"
File "..\staging\nssm.exe"
- File "..\assets\$app_name_lower.ico"
+ File "/oname=icon.ico" "..\assets\$app_name_lower.ico"
$extra_install_files