Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Mattias Gustavsson 2020-04-27 10:56:00 +02:00
commit af53f829d7
5 changed files with 43 additions and 810 deletions

View File

@ -1,8 +1,5 @@
#!/bin/bash
# Kill the existing running instance
sudo killall Symphony
delete_app()
{
# Delete the installed version only if it is older than the installing version

View File

@ -9,7 +9,7 @@
<array>
<dict>
<key>APPLICATION_ID</key>
<string>com.symphony.symphony-desktop</string>
<string>com.symphony.electron-desktop</string>
<key>STATE</key>
<true/>
</dict>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -37,8 +37,7 @@
"copy:darwin": "ncp config 'node_modules/electron/dist/Electron.app/Contents/config'",
"copy:win32": "ncp config node_modules\\electron\\dist\\config",
"unpacked-mac": "npm run prebuild && npm run test && ./node_modules/.bin/electron-builder build --mac --dir",
"unpacked-win": "npm run prebuild && npm run test && node_modules\\.bin\\electron-builder build --win --x64 --dir",
"unpacked-win-x86": "npm run prebuild && npm run test && node_modules\\.bin\\electron-builder build --win --ia32 --dir"
"unpacked-win": "npm run prebuild && npm run test && node_modules\\.bin\\electron-builder build --win --x64 --dir"
},
"build": {
"appId": "com.symphony.electron-desktop",