Merge tag 'v1.5.6' into hebrew-support

.travis.yml

@@ -24,7 +24,7 @@ before_deploy:
   - sudo dpkg --add-architecture i386
   - sudo apt-get -qq update
   - sudo rm /var/lib/dpkg/lock
-  - sudo apt-get install -y -qq wine-stable zip xvfb rpm
+  - sudo apt-get install -y -qq wine-stable zip xvfb
   - wine wineboot --init # WINEARCH=win32
   #
   # actuall building of the binaries
@@ -36,11 +36,15 @@ before_deploy:
   # RPM and DEB binaries
   # install fpm
   - gem install --no-document fpm
+  # needed to deploy on rpm / pacman
+  - sudo apt-get install -y -qq rpm libarchive-tools
   #
   - npm run -loglevel ${NPM_DEBUG_LEVEL} gulp deploy:linux-x64:rpm:nodep
   - npm run -loglevel ${NPM_DEBUG_LEVEL} gulp deploy:linux-x64:deb:nodep
+  - npm run -loglevel ${NPM_DEBUG_LEVEL} gulp deploy:linux-x64:pacman:nodep
   - npm run -loglevel ${NPM_DEBUG_LEVEL} gulp deploy:linux-ia32:rpm:nodep
   - npm run -loglevel ${NPM_DEBUG_LEVEL} gulp deploy:linux-ia32:deb:nodep
+  - npm run -loglevel ${NPM_DEBUG_LEVEL} gulp deploy:linux-ia32:pacman:nodep
   #
   # Flatpak
   # install flatpak dependencies
@@ -73,17 +77,24 @@ deploy:
   api_key: "${API_KEY}"
   # files to copy to github release
   file:
-    - "dist/yakyak-${YAKYAK_VERSION}-linux-x64.tar.gz"
-    - "dist/yakyak-${YAKYAK_VERSION}-linux-ia32.tar.gz"
-    - "dist/yakyak-${YAKYAK_VERSION}-win32-ia32.zip"
-    - "dist/yakyak-${YAKYAK_VERSION}-win32-x64.zip"
     - "dist/yakyak-${YAKYAK_VERSION}-osx.zip"
-      #- "dist/com.github.yakyak.YakYak_master_x64.flatpak"
-      #- "dist/com.github.yakyak.YakYak_master_ia32.flatpak"
+#
+    - "dist/yakyak-${YAKYAK_VERSION}-linux-x64.tar.gz"
+    - "dist/yakyak-${YAKYAK_VERSION}-linux-x64.rpm"
     - "dist/yakyak-${YAKYAK_VERSION}-linux-amd64.deb"
+    - "dist/yakyak-${YAKYAK_VERSION}-linux-x64-pacman.tar.gz"
+#
+    - "dist/yakyak-${YAKYAK_VERSION}-win32-x64.zip"
+#
+    - "dist/yakyak-${YAKYAK_VERSION}-linux-ia32.tar.gz"
     - "dist/yakyak-${YAKYAK_VERSION}-linux-i386.deb"
-    - "dist/yakyak-${YAKYAK_VERSION}-linux-i386.rpm"
-    - "dist/yakyak-${YAKYAK_VERSION}-linux-x86_64.rpm"
+    - "dist/yakyak-${YAKYAK_VERSION}-linux-ia32.rpm"
+    - "dist/yakyak-${YAKYAK_VERSION}-linux-ia32-pacman.tar.gz"
+#
+    - "dist/yakyak-${YAKYAK_VERSION}-win32-ia32.zip"
+#
+#    - "dist/com.github.yakyak.YakYak_master_x64.flatpak"
+#    - "dist/com.github.yakyak.YakYak_master_ia32.flatpak"
   # only trigger on tags
   on:
     tags: true

README.md

@@ -36,7 +36,7 @@ We love [bug reports](https://github.com/yakyak/yakyak/issues)!
 * Focus/typing indications (mainly a design issue. keep it clean)
 * Offer alternative color schemes
 * Translations in 22 languages so far:
-  * English / Portuguese _(Portugal and Brazil)_ / French / Spanish / Czech / German / Polish / Russian / Hebrew / Ukrainian / Slovenian / Korean / Tamil / Romanian / Swedish / Japanese / Italian / Danish / Bengali / Slovak / Turkish
+  * English / Portuguese _(Portugal and Brazil)_ / French / Spanish / Czech / German / Polish / Russian / Hebrew / Ukrainian / Slovenian / Korean / Tamil / Romanian / Swedish / Japanese / Italian / Danish / Bengali / Slovak / Turkish / Arabic / Telugu / Finnish /Breton / Simplified chinese
   * We're looking for volunteers to translate the app to new languages
 
 ![sshot1](https://cloud.githubusercontent.com/assets/123929/16032393/991d63f8-3205-11e6-98bf-31f1b57cdc96.png)
@@ -124,11 +124,12 @@ $ npm run deploy
 $ npm run deploy:darwin-x64
 ```
 
-If you have [fpm](https://github.com/jordansissel/fpm) installed (`gem install fpm`), you can also build RPM and Deb packages:
+If you have [fpm](https://github.com/jordansissel/fpm) installed (`gem install fpm`), you can also build RPM, Deb, or Arch packages:
 
 ```bash
 $ npm run deploy:linux-x64:rpm
 $ npm run deploy:linux-x64:deb
+$ npm run deploy:linux-x64:pacman
 ```
 
 *note:* if you are building *Windows* binaries in *Linux* or *Mac OS X*, Wine (1.6 or higher) must be installed. It also requires a 32-bit Wine installation when building Windows 32-bit binary.

gulpfile.coffee

@@ -327,16 +327,29 @@ platformOpts.map (plat) ->
     #
 
 archOpts.forEach (arch) ->
-    ['deb', 'rpm'].forEach (target) ->
+    ['deb', 'rpm', 'pacman'].forEach (target) ->
         gulp.task "deploy:linux-#{arch}:#{target}:nodep", (done) ->
+
+            archNameSuffix = archName
             if arch is 'ia32'
                 archName = 'i386'
+                archNameSuffix = 'ia32'
             else if target is 'deb'
                 archName = 'amd64'
+                archNameSuffix = 'amd64'
             else
                 archName = 'x86_64'
+                archNameSuffix = 'x64'
 
-            packageName = json.name + '-VERSION-linux-ARCH.' + target
+            if target == 'pacman'
+                suffix = 'tar.gz'
+            else
+                suffix = target
+
+            if target == 'pacman'
+                packageName = json.name + '-VERSION-linux-' + archNameSuffix + '-pacman.' + suffix
+            else   
+                packageName = json.name + '-VERSION-linux-' + archNameSuffix + '.' + suffix
             iconArgs = [16, 32, 48, 128, 256, 512].map (size) ->
                 if size < 100
                     src = "0#{size}"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "yakyak",
-  "version": "1.5.5",
+  "version": "1.5.6",
   "description": "Chat client for Google Hangouts",
   "main": "main.js",
   "scripts": {
@@ -18,10 +18,12 @@
     "deploy:linux-x64:deb": "gulp deploy:linux-x64:deb",
     "deploy:linux-x64:flatpak": "gulp deploy:linux-x64:flatpak",
     "deploy:linux-x64:rpm": "gulp deploy:linux-x64:rpm",
+    "deploy:linux-x64:pacman": "gulp deploy:linux-x64:pacman",
     "deploy:linux-ia32": "gulp deploy:linux-ia32",
     "deploy:linux-ia32:deb": "gulp deploy:linux-ia32:deb",
     "deploy:linux-ia32:flatpak": "gulp deploy:linux-ia32:flatpak",
     "deploy:linux-ia32:rpm": "gulp deploy:linux-ia32:rpm",
+    "deploy:linux-ia32:pacman": "gulp deploy:linux-ia32:pacman",
     "deploy:win32-x64": "gulp deploy:win32-x64",
     "deploy:win32-ia32": "gulp deploy:win32-ia32",
     "deploy:darwin-x64": "gulp deploy:darwin-x64"
@@ -78,7 +80,7 @@
     "chai": "^4.2.0",
     "coffeescript": "^1.9.3",
     "devtron": "^1.4.0",
-    "electron": "^8.0.0",
+    "electron": "^7.1.7",
     "electron-packager": "^14.1.1",
     "gulp": "^4.0.2",
     "gulp-changed": "^4.0.2",

src/ui/views/trayicon.coffee

@@ -5,21 +5,25 @@ i18n = require 'i18n'
 { Menu, Tray, nativeImage } = require('electron').remote
 
 if os.platform() == 'darwin'
-    trayIcons =
+    trayIconsPath =
         "read": path.join __dirname, '..', '..', 'icons', 'osx-icon-read-Template.png'
         "unread": path.join __dirname, '..', '..', 'icons', 'osx-icon-unread-Template.png'
 
 else if process.env.XDG_CURRENT_DESKTOP && process.env.XDG_CURRENT_DESKTOP.match(/KDE/)
     # This is to work around a bug with electron apps + KDE not showing correct icon size.
-    trayIcons =
+    trayIconsPath =
       "read": path.join __dirname, '..', '..', 'icons', '[email protected]'
       "unread": path.join __dirname, '..', '..', 'icons', '[email protected]'
 
 else
-    trayIcons =
+    trayIconsPath =
         "read": path.join __dirname, '..', '..', 'icons', '[email protected]'
         "unread": path.join __dirname, '..', '..', 'icons', '[email protected]'
 
+trayIcons =
+  "read": nativeImage.createFromPath(trayIconsPath["read"])
+  "unread": nativeImage.createFromPath(trayIconsPath["unread"])
+
 tray = null
 
 # TODO: this is all WIP
@@ -36,6 +40,7 @@ create = () ->
 
 destroy = ->
     tray.destroy() if tray
+    console.log('is Destroyed', tray.isDestroyed())
     tray = null
 
 update = (unreadCount, viewstate) ->