Simplify and cleanup package

3 files changed, 10 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cc935b78ac84..1f50a385780d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = signal-desktop-bin
 	pkgdesc = Private messaging from your desktop
 	pkgver = 1.0.36
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/WhisperSystems/Signal-Desktop
 	arch = x86_64
 	license = GPL3
@@ -11,7 +11,6 @@ pkgbase = signal-desktop-bin
 	depends = libxtst
 	depends = nss
 	depends = xdg-utils
-	depends = desktop-file-utils
 	depends = libxss
 	provides = signal-desktop
 	conflicts = signal
@@ -19,7 +18,7 @@ pkgbase = signal-desktop-bin
 	source = https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_1.0.36_amd64.deb
 	source = signal-desktop
 	sha512sums = e948404b41e5b65afe2f004a5d029320d834a8fb4a2abed235b435ee63b2b59a10eb8833cfa41a8899d8fd37de0fd922f246f39d89f01a43ac85f97f4c17c3cf
-	sha512sums = f04626ca425f79129616ba25732b07b0fc50aab1dbe9bd3e79514e8a0ba3b382ee37f99ad9f32ca9359fbe1db3efe67d0d207610836634d28c2401b5729f07af
+	sha512sums = 7db7ee79a07fb86fec471e63c5189d61e8a2ca8fc2e659ea89ef22516e24e0a3c9f32c93f8ee520f56abc187b9b9304355e8aadb427c4920cda4f663ab1489fa
 
 pkgname = signal-desktop-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index 530230e7bbed..670410e70316 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=signal-desktop-bin
 pkgver=1.0.36
-pkgrel=1
+pkgrel=2
 pkgdesc='Private messaging from your desktop'
 arch=('x86_64')
 url='https://github.com/WhisperSystems/Signal-Desktop'
@@ -10,26 +10,18 @@ license=('GPL3')
 provides=('signal-desktop')
 conflicts=('signal')
 options=(!strip)
-depends=('gconf' 'gtk2' 'libnotify' 'libxtst' 'nss' 'xdg-utils' 'desktop-file-utils' 'libxss')
+depends=('gconf' 'gtk2' 'libnotify' 'libxtst' 'nss' 'xdg-utils' 'libxss')
 
 sha512sums=('e948404b41e5b65afe2f004a5d029320d834a8fb4a2abed235b435ee63b2b59a10eb8833cfa41a8899d8fd37de0fd922f246f39d89f01a43ac85f97f4c17c3cf'
-            'f04626ca425f79129616ba25732b07b0fc50aab1dbe9bd3e79514e8a0ba3b382ee37f99ad9f32ca9359fbe1db3efe67d0d207610836634d28c2401b5729f07af')
+            '7db7ee79a07fb86fec471e63c5189d61e8a2ca8fc2e659ea89ef22516e24e0a3c9f32c93f8ee520f56abc187b9b9304355e8aadb427c4920cda4f663ab1489fa')
 source=("https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${pkgver}_amd64.deb"
         'signal-desktop')
 
-prepare() {
-    # Extract data
-    bsdtar xf data.tar.xz
-}
-
 package() {
-  # Recursively remove group's write permission before moving to package directory
-  chmod -R g-w usr opt
-  
-  # move data
-  mv opt "${pkgdir}"
-  mv usr "${pkgdir}"
-    
+  # extract package data
+  tar xf data.tar.xz -C "${pkgdir}"
+
+  # install alias in /usr/bin
   mkdir "${pkgdir}/usr/bin"
   install -D -m755 signal-desktop "${pkgdir}/usr/bin/signal-desktop"
 }
diff --git a/signal-desktop b/signal-desktop
index 57a1fcdbe010..b72ff6b15c5e 100755
--- a/signal-desktop
+++ b/signal-desktop
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec "/opt/Signal/signal-desktop" %U
+exec /opt/Signal/signal-desktop "$@"