4.14.0

Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>

4 files changed, 32 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index da840be77e85..c9a952fe6fc7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
 pkgbase = slack-electron
 	pkgdesc = Slack Desktop (Beta) for Linux, modified to use the system 'electron' package instead of its own
-	pkgver = 4.11.3
+	pkgver = 4.14.0
 	pkgrel = 1
 	url = https://slack.com/downloads
 	arch = x86_64
 	license = custom: Slack
 	depends = electron
-	optdepends = libappindicator-gtk3: for notification indicator in the status bar on Gnome
+	optdepends = libappindicator-gtk3: for notification indicator in the status bar on GNOME
 	provides = slack
 	provides = slack-desktop
 	conflicts = slack-desktop
-	source = https://downloads.slack-edge.com/linux_releases/slack-desktop-4.11.3-amd64.deb
+	source = https://downloads.slack-edge.com/linux_releases/slack-desktop-4.14.0-amd64.deb
 	source = slack.sh
-	sha256sums = 03b7fbc8d2f3cdc70be8533dfb09a6fd3e7c2f428e97df27830b0712f479a67c
-	sha256sums = ee973ec37027e96e140499cb85dd9587c9dab59bea5a240112c3792bd61a5846
+	sha256sums = cfa500b6c5109724d5fc123477d5e4c9740e332a56397a1413462da9358ac977
+	sha256sums = 4db11d083626a561129ca40e9cce7cc613c42223f138bb0136c62064c57471fd
 
 pkgname = slack-electron
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..0d0182789427
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+*.deb
+src
+pkg
+*.pkg.*
+*.log
diff --git a/PKGBUILD b/PKGBUILD
index 832ec5a63e2e..d8c06d0e6b33 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,39 @@
-# Maintainer: WhiredPlanck
-# Maintainer: Vyacheslav Konovalov <f4f7l1hvr@relay.firefox.com>
+# Maintainer: Yurii Kolesnykov <root@yurikoles.com>
 
 pkgname=slack-electron
-pkgver=4.11.3
+_product="${pkgname%-electron}"
+pkgver=4.14.0
 pkgrel=1
 pkgdesc="Slack Desktop (Beta) for Linux, modified to use the system 'electron' package instead of its own"
 arch=('x86_64')
 url="https://slack.com/downloads"
 license=('custom: Slack')
 depends=('electron')
-optdepends=('libappindicator-gtk3: for notification indicator in the status bar on Gnome')
-provides=('slack' 'slack-desktop')
-conflicts=('slack-desktop')
+optdepends=('libappindicator-gtk3: for notification indicator in the status bar on GNOME')
+provides=("${_product}" "${_product}-desktop")
+conflicts=("${_product}-desktop")
 source=("https://downloads.slack-edge.com/linux_releases/slack-desktop-$pkgver-amd64.deb"
         'slack.sh')
-sha256sums=('03b7fbc8d2f3cdc70be8533dfb09a6fd3e7c2f428e97df27830b0712f479a67c'
-            'ee973ec37027e96e140499cb85dd9587c9dab59bea5a240112c3792bd61a5846')
+sha256sums=('cfa500b6c5109724d5fc123477d5e4c9740e332a56397a1413462da9358ac977'
+            '4db11d083626a561129ca40e9cce7cc613c42223f138bb0136c62064c57471fd')
 
 prepare() {
   bsdtar -xf data.tar.xz
 
   # Enable slack silent mode and fix icon
-  sed -ri 's|^(Exec=.+/slack)(.+)|\1 -s\2|' $srcdir/usr/share/applications/slack.desktop
-  sed -ri 's/^Icon=.+slack\.png/Icon=slack/' $srcdir/usr/share/applications/slack.desktop
+  sed -ri \
+	-e 's|^(Exec=.+/slack)(.+)|\1 -s\2|' \
+	-e 's/^Icon=.+slack\.png/Icon=slack/' \
+	"usr/share/applications/${_product}.desktop"
 }
 
 package() {
-  install -Dm755 slack.sh "$pkgdir/usr/bin/slack"
-  install -Dm644 usr/lib/slack/resources/app.asar -t "$pkgdir/usr/share/slack"
-  cp -r usr/lib/slack/resources/app.asar.unpacked "$pkgdir/usr/share/slack"
-  install -Dm644 usr/share/applications/slack.desktop -t "$pkgdir/usr/share/applications"
-  install -Dm644 usr/share/pixmaps/slack.png -t "$pkgdir/usr/share/pixmaps"
-  install -Dm644 "$srcdir/usr/lib/slack/LICENSE" "$pkgdir/usr/share/licenses/slack/LICENSE"
+  install -Dm755 "${_product}.sh" "$pkgdir/usr/bin/${_product}"
+
+  install -dm755 "$pkgdir/usr/lib/${_product}/"
+  cp -dr --no-preserve=ownership usr/lib/${_product}/resources/* "$pkgdir/usr/lib/${_product}/"
+
+  install -Dm644 "usr/share/applications/${_product}.desktop" -t "$pkgdir/usr/share/applications"
+  install -Dm644 "usr/share/pixmaps/${_product}.png" -t "$pkgdir/usr/share/pixmaps"
+  install -Dm644 "usr/lib/${_product}/LICENSE" "$pkgdir/usr/share/licenses/${_product}/LICENSE"
 }
diff --git a/slack.sh b/slack.sh
index 393104dfc1df..083824f48b25 100644
--- a/slack.sh
+++ b/slack.sh
@@ -1,3 +1,3 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
-exec electron /usr/share/slack/app.asar "$@"
+exec electron /usr/lib/slack/app.asar "$@"