correct bin name

4 files changed, 39 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e36c00ad5819..9b76ca60614b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue May 23 23:07:55 UTC 2017
+# Thu May 25 10:18:59 UTC 2017
 pkgbase = rambox
 	pkgdesc = Free and Open Source messaging and emailing app that combines common web applications into one.
 	pkgver = 0.5.8
-	pkgrel = 1
+	pkgrel = 2
 	url = http://rambox.pro/
 	arch = i686
 	arch = x86_64
@@ -18,11 +18,11 @@ pkgbase = rambox
 	source = https://github.com/saenzramiro/rambox/archive/0.5.8.tar.gz
 	source = https://github.com/saenzramiro/rambox/releases/download/0.5.8/Rambox-0.5.8-x64.tar.gz
 	source = rambox.desktop
-	source = rambox.sh
+	source = rambox.js
 	sha256sums = e7f0a942d8a141a25637858864f635cbe1ab4c669dd626199d5be94779b037ca
 	sha256sums = 6c2f257c22516988919c64fd37a5a3e9b9ef18d366907c43d3140cf91cc850c0
 	sha256sums = 61ad70a929c402e24c79b8868208310f9b3c4d7801db2b791af38293231ee524
-	sha256sums = 0e89fab1fb649a24ade04f5a6d2ad61cf49b789dd9b22eec0308f3a75a0cb4b0
+	sha256sums = 3b5ed6f04eea66f239b5ae56ea1ff9e47de156cd38bb54ebc46541daba6091b6
 
 pkgname = rambox
 
diff --git a/PKGBUILD b/PKGBUILD
index 853c9e2f45be..c46bbc884046 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=rambox
 pkgver=0.5.8
-pkgrel=1
+pkgrel=2
 pkgdesc='Free and Open Source messaging and emailing app that combines common web applications into one.'
 arch=(i686 x86_64)
 depends=(electron)
@@ -11,11 +11,11 @@ url='http://rambox.pro/'
 license=('GPL3')
 source=("https://github.com/saenzramiro/$pkgname/archive/$pkgver.tar.gz"
         "https://github.com/saenzramiro/$pkgname/releases/download/$pkgver/Rambox-$pkgver-x64.tar.gz"
-        "$pkgname.desktop" "$pkgname.sh")
+        "$pkgname.desktop" "$pkgname.js")
 sha256sums=('e7f0a942d8a141a25637858864f635cbe1ab4c669dd626199d5be94779b037ca'
             '6c2f257c22516988919c64fd37a5a3e9b9ef18d366907c43d3140cf91cc850c0'
             '61ad70a929c402e24c79b8868208310f9b3c4d7801db2b791af38293231ee524'
-            '0e89fab1fb649a24ade04f5a6d2ad61cf49b789dd9b22eec0308f3a75a0cb4b0')
+            '3b5ed6f04eea66f239b5ae56ea1ff9e47de156cd38bb54ebc46541daba6091b6')
 noextract=("Rambox-$pkgver-x64.tar.gz")
 
 build() {
@@ -37,10 +37,10 @@ build() {
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
 	
-	install -d "$pkgdir/opt"
-	cp -r 'build/production/Rambox' "$pkgdir/opt/rambox"
+	install -d "$pkgdir/usr/lib"
+	cp -r 'build/production/Rambox' "$pkgdir/usr/lib/rambox"
 	
-	install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
+	install -Dm755 "$srcdir/$pkgname.js" "$pkgdir/usr/bin/$pkgname"
 	install -Dm644 'resources/Icon.png' "$pkgdir/usr/share/pixmaps/$pkgname.png"
 	desktop-file-install "$srcdir/$pkgname.desktop" --dir "$pkgdir/usr/share/applications/"
 }
diff --git a/rambox.js b/rambox.js
new file mode 100755
index 000000000000..5fafe02a4f94
--- /dev/null
+++ b/rambox.js
@@ -0,0 +1,29 @@
+#!/usr/bin/electron
+
+const name = 'rambox'
+
+const {app} = require('electron')
+const fs = require('fs')
+const path = require('path')
+
+// Change command name.
+const fd = fs.openSync('/proc/self/comm', fs.constants.O_WRONLY)
+fs.writeSync(fd, name)
+fs.closeSync(fd)
+
+// Remove first command line argument (/usr/bin/electron).
+process.argv.splice(0, 1)
+
+// Set application paths.
+const appPath = path.join(path.dirname(__dirname), 'lib', name)
+const packageJson = require(path.join(appPath, 'package.json'))
+const productName = packageJson.productName
+app.setAppPath(appPath)
+app.setDesktopName(name + '.desktop')
+app.setName(productName)
+app.setPath('userCache', path.join(app.getPath('cache'), productName))
+app.setPath('userData', path.join(app.getPath('appData'), productName))
+app.setVersion(packageJson.version)
+
+// Run the application.
+require('module')._load(appPath, module, true)
diff --git a/rambox.sh b/rambox.sh
deleted file mode 100755
index e72477466542..000000000000
--- a/rambox.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-electron /opt/rambox "$@"