Fixed tray icon

3 files changed, 17 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 248ce8356f09..4979708b8515 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = deezer-enhanced
 	pkgdesc = An unofficial application for Deezer with enhanced features
 	pkgver = 0.3.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/duzda/deezer-enhanced
 	arch = any
 	license = MIT
@@ -11,7 +11,7 @@ pkgbase = deezer-enhanced
 	source = deezer-enhanced.js
 	source = deezer-enhanced.desktop
 	sha512sums = a008cd01a76a17dfa27b7245f32747f4fd1d2d228532dbb620813ea9ec03faee79648b687792ab75209885b4b8250768e21c378560e6e30f9bb250b851862fb6
-	sha512sums = 11275cdfdd6d6224fb4eeadb231edd762317b0c47e99f8858a9eeaa61726a01fb3ae5ae852e15e1b9e7a4dfe08b0bc4466c1d9b659941f87f1508b9dc4fca16a
+    sha512sums = e359569fbd9767a7276cb754010d8bf4dcd35fd958bbc3c50baa042bceebc132a10e302810821e77d730873efa5511bccbcf89d18f146a29e1e94a5a96a1ba0f
 	sha512sums = 02deef321066e1b2decce7d35d483a8e88df52d032ddfef9a6b28f8a5fd006d1316dff54f70d8f6b53499e51fc4b4f3d231482b70cdbf6bfc3c57dbfedfe4f22
 
 pkgname = deezer-enhanced
diff --git a/PKGBUILD b/PKGBUILD
index 4bdef130ee14..817b45f5c0ed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
 # Maintainer: Dušan Simić <dusan.simic1810@gmail.com>
+# Maintainer: duzda <duzda@disroot.org>
 
 _electron=electron
 pkgname=deezer-enhanced
@@ -14,13 +15,13 @@ source=("$url/archive/v$pkgver.tar.gz"
         "$pkgname.js"
 				"$pkgname.desktop")
 sha512sums=('a008cd01a76a17dfa27b7245f32747f4fd1d2d228532dbb620813ea9ec03faee79648b687792ab75209885b4b8250768e21c378560e6e30f9bb250b851862fb6'
-            '11275cdfdd6d6224fb4eeadb231edd762317b0c47e99f8858a9eeaa61726a01fb3ae5ae852e15e1b9e7a4dfe08b0bc4466c1d9b659941f87f1508b9dc4fca16a'
+            'e359569fbd9767a7276cb754010d8bf4dcd35fd958bbc3c50baa042bceebc132a10e302810821e77d730873efa5511bccbcf89d18f146a29e1e94a5a96a1ba0f'
             '02deef321066e1b2decce7d35d483a8e88df52d032ddfef9a6b28f8a5fd006d1316dff54f70d8f6b53499e51fc4b4f3d231482b70cdbf6bfc3c57dbfedfe4f22')
 
 build() {
 	cd "$pkgname-$pkgver"
 
-	yarn --ignore-scripts --production
+	yarn --ignore-scripts --production && yarn minify-webcss
 	sed -i "s~@ELECTRON@~$_electron~" "$srcdir/$pkgname.js"
 }
 
diff --git a/deezer-enhanced.js b/deezer-enhanced.js
index a0f717a4d121..f1ccebfe6516 100644
--- a/deezer-enhanced.js
+++ b/deezer-enhanced.js
@@ -17,7 +17,7 @@ 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.build.productName;
+const productName = packageJson.name;
 app.setAppPath(appPath);
 app.setDesktopName(name + '.desktop');
 app.setName(productName);
@@ -25,5 +25,16 @@ app.setPath('userCache', path.join(app.getPath('cache'), productName));
 app.setPath('userData', path.join(app.getPath('appData'), productName));
 app.setVersion(packageJson.version);
 
+// Copy icon to userpath
+try {
+    if (!fs.existsSync(path.join(app.getPath('userData'), 'assets', 'icon.png'))) {
+        fs.mkdirSync(path.join(app.getPath('userData'), 'assets'));
+        fs.copyFileSync(path.join(appPath, 'assets', 'icon.png'), path.join(app.getPath('userData'), 'assets', 'icon.png'));
+    }
+} catch(err) {
+    console.log("Tray won't work: ");
+    console.log(err);
+}
+
 // Run the application
 require('module')._load(appPath, module, true);