sync with deb pkg

5 files changed, 47 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b76c4ec796fb..bb962bba6ac4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,20 @@
 pkgbase = upwork
-	pkgdesc = Desktop App 64-bit Standard version
+	pkgdesc = Desktop Application
 	pkgver = 5.3.3.871
-	pkgrel = 2
-	url = https://www.upwork.com/downloads?source=Footer
-	install = upwork.install
+	pkgrel = 3
+	url = https://www.upwork.com/downloads/
 	arch = x86_64
 	license = custom
-	depends = alsa-lib
 	depends = gtk3
 	depends = libxss
 	depends = nss
 	conflicts = upwork-alpha
 	source = https://updates-desktopapp.upwork.com/binaries/v5_3_3_871_51d563431f844aff/upwork_5.3.3.871_amd64.deb
 	source = LICENSE
+	source = upwork
 	sha256sums = 53a8cf15610563475e45127522f230f4fcfdc7b70cf915e3d573845bad0c19fd
 	sha256sums = 793d8d7bc0f088c48798bda3d5483972636c6b8c5dcd9aeaf85411f7d4547b38
+	sha256sums = 8b9006e78723394776518847a8dd7f45eb797b51514359727d0fe3e3207e9452
 
 pkgname = upwork
 
diff --git a/.gitignore b/.gitignore
index 497aa726cbbe..b0ccfab81ade 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 !*.install
 !.gitignore
 !LICENSE
+!upwork
diff --git a/PKGBUILD b/PKGBUILD
index 5b65fbd0ff08..a84303a4fe86 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,28 +5,46 @@ pkgname=upwork
 pkgver=5.3.3.871
 _rawver=${pkgver//./_}
 _hashver='51d563431f844aff'
-pkgrel=2
-pkgdesc='Desktop App 64-bit Standard version'
+pkgrel=3
+pkgdesc='Desktop Application'
 arch=(x86_64)
-url='https://www.upwork.com/downloads?source=Footer'
+url='https://www.upwork.com/downloads/'
 license=(custom)
 conflicts=(upwork-alpha)
-depends=(alsa-lib gtk3 libxss nss)
-install=upwork.install
+depends=(gtk3 libxss nss)
 source=(https://updates-desktopapp.upwork.com/binaries/v${_rawver}_${_hashver}/upwork_${pkgver}_amd64.deb
-        LICENSE)
+	LICENSE
+	upwork)
 sha256sums=('53a8cf15610563475e45127522f230f4fcfdc7b70cf915e3d573845bad0c19fd'
-            '793d8d7bc0f088c48798bda3d5483972636c6b8c5dcd9aeaf85411f7d4547b38')
+            '793d8d7bc0f088c48798bda3d5483972636c6b8c5dcd9aeaf85411f7d4547b38'
+            '8b9006e78723394776518847a8dd7f45eb797b51514359727d0fe3e3207e9452')
 
 prepare() {
-    cd $srcdir
-    tar -xJf $srcdir/data.tar.xz
+    tar -xJf data.tar.xz
 }
 
 package() {
-    cd $srcdir
-    cp -rp usr $pkgdir/usr
-    cp -rp opt $pkgdir/opt
+    # Base
+    install -dm755 $pkgdir/opt/$pkgname
+    cp -dr --no-preserve=ownership opt/upwork/* $pkgdir/opt/$pkgname/
 
-    install -Dm644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+    # Code ref: https://github.com/electron-userland/electron-builder/blob/master/packages/app-builder-lib/templates/linux/after-install.tpl
+    # SUID chrome-sandbox for Electron 5+
+    test -e $pkgdir/opt/$pkgname/chrome-sandbox && chmod 4755 $pkgdir/opt/$pkgname/chrome-sandbox || true
+
+    # Exec
+    install -dm755 $pkgdir/usr/bin/
+    install -Dm755 upwork $pkgdir/usr/bin/
+
+    # Menu
+    install -Dm644 usr/share/applications/upwork.desktop $pkgdir/usr/share/applications/$pkgname.desktop
+
+    # Icons
+    for size in 16 32 48 64 128 256 512 1024; do
+	install -Dm644 "usr/share/icons/hicolor/${size}x${size}/apps/upwork.png" \
+		"${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/${pkgname}.png"
+    done
+
+    # License
+    install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
diff --git a/upwork b/upwork
new file mode 100644
index 000000000000..4875462de381
--- /dev/null
+++ b/upwork
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+IS_UNITY_FAMILY=`echo $XDG_CURRENT_DESKTOP | awk -F: "{print $1}"`
+
+if [ "$IS_UNITY_FAMILY" == "Unity" ]; then
+  export XDG_CURRENT_DESKTOP=Unity
+fi
+
+cd "/opt/upwork"
+exec "./upwork" "$@"
diff --git a/upwork.install b/upwork.install
deleted file mode 100644
index 1d15e5ac1539..000000000000
--- a/upwork.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    xdg-icon-resource forceupdate
-}