diff options
author | Kali Kaneko (leap communications) <kali@leap.se> | 2019-08-05 04:05:43 +0200 |
---|---|---|
committer | Ruben Pollan <meskio@sindominio.net> | 2019-08-05 11:46:23 -0400 |
commit | ab32f305929c4da515616e61890f0d638b06fb33 (patch) | |
tree | 7d4ed25cc2c4f56b7d357a7aa56e3bf2aafdbda1 | |
parent | d5f06cc47dcdfa4b61219ffbf280157a312e0efa (diff) |
[pkg] cleanup icons
-rw-r--r-- | branding/assets/riseup/icon.bmp | bin | 0 -> 65674 bytes | |||
-rw-r--r--[-rwxr-xr-x] | branding/assets/riseup/icon.icns | bin | 4286 -> 1359609 bytes | |||
-rw-r--r-- | branding/assets/riseup/riseupvpn.icns | bin | 1359609 -> 0 bytes | |||
-rwxr-xr-x | branding/assets/riseup/riseupvpn.ico | bin | 4286 -> 0 bytes | |||
-rw-r--r-- | branding/templates/debian/app.desktop-template | 2 | ||||
-rw-r--r-- | branding/templates/osx/generate.py | 2 | ||||
-rwxr-xr-x | branding/templates/windows/template.nsi | 2 | ||||
-rw-r--r-- | pkg/config/config.go | 2 |
8 files changed, 4 insertions, 4 deletions
diff --git a/branding/assets/riseup/icon.bmp b/branding/assets/riseup/icon.bmp Binary files differnew file mode 100644 index 0000000..9e918e4 --- /dev/null +++ b/branding/assets/riseup/icon.bmp diff --git a/branding/assets/riseup/icon.icns b/branding/assets/riseup/icon.icns Binary files differindex c65c9e1..b4c9a20 100755..100644 --- a/branding/assets/riseup/icon.icns +++ b/branding/assets/riseup/icon.icns diff --git a/branding/assets/riseup/riseupvpn.icns b/branding/assets/riseup/riseupvpn.icns Binary files differdeleted file mode 100644 index b4c9a20..0000000 --- a/branding/assets/riseup/riseupvpn.icns +++ /dev/null diff --git a/branding/assets/riseup/riseupvpn.ico b/branding/assets/riseup/riseupvpn.ico Binary files differdeleted file mode 100755 index c65c9e1..0000000 --- a/branding/assets/riseup/riseupvpn.ico +++ /dev/null diff --git a/branding/templates/debian/app.desktop-template b/branding/templates/debian/app.desktop-template index eb831f7..761e3a9 100644 --- a/branding/templates/debian/app.desktop-template +++ b/branding/templates/debian/app.desktop-template @@ -7,7 +7,7 @@ Comment[es]=VPN Facil de ${name} Comment[de]=Easy VPN by ${name} Exec=${binaryName} %U Terminal=false -Icon=riseupvpn +Icon=icon Categories=Network;Application; StartupNotify=true X-AppInstall-Package=${binaryName} diff --git a/branding/templates/osx/generate.py b/branding/templates/osx/generate.py index 528605d..440ee34 100644 --- a/branding/templates/osx/generate.py +++ b/branding/templates/osx/generate.py @@ -32,7 +32,7 @@ VERSION = data.get('version', 'unknown') APP_PATH = os.path.abspath(here + '/../dist/' + APPNAME + ".app") STAGING = os.path.abspath(here + '/../staging/') ASSETS = os.path.abspath(here + '/../assets/') -ICON = os.path.join(ASSETS, APPNAME.lower() + '.icns') +ICON = os.path.join(ASSETS, 'icon.icns') SCRIPTS = os.path.join(os.path.abspath(here), 'scripts') INFO_PLIST = APP_PATH + '/Contents/Info.plist' HELPER_PLIST = os.path.join(SCRIPTS, 'se.leap.bitmask-helper.plist') diff --git a/branding/templates/windows/template.nsi b/branding/templates/windows/template.nsi index 00118e1..3f049f9 100755 --- a/branding/templates/windows/template.nsi +++ b/branding/templates/windows/template.nsi @@ -30,7 +30,7 @@ RequestExecutionLevel admin -!define BITMAP_FILE riseupvpn.bmp +!define BITMAP_FILE icon.bmp !define MUI_ICON "..\assets\$applicationNameLower.ico" !define MUI_UNICON "..\assets\$applicationNameLower.ico" diff --git a/pkg/config/config.go b/pkg/config/config.go index 4f2ab38..dd13c8b 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -1,6 +1,6 @@ // Code generated by go generate; DO NOT EDIT. // This file was generated by vendorize.py -// At 2019-07-29 21:55:46 +// At 2019-07-30 21:50:50 package config |