Optimize PKGBUILD

3 files changed, 20 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bcd8c61f0bf3..c8e848105e04 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -6,15 +6,13 @@ pkgbase = google-messages
 	arch = x86_64
 	arch = i686
 	arch = pentium4
+	arch = armv7h
 	arch = aarch64
-	license = unknown
-	makedepends = npm
-	makedepends = nodejs
+	license = custom
+	makedepends = nodejs-nativefier
 	source = google-messages.png::https://raw.githubusercontent.com/kelyvin/Google-Messages-For-Desktop/v1.1.2/android-messages-logo.png
-	source = google-messages.sh
 	source = google-messages.desktop
 	sha256sums = 3c938c748fbef4cdd72e638b26aa35f3e2da8045a0c5490ede8b6ef5603f1b2c
-	sha256sums = 803d148788b75176f8333077c08e9e25081127c30f0476809c131ef93d25a6b3
 	sha256sums = 6909e255521af089883f18740fc91c7743897c99d4ece0784b969cea5bc480ae
 
 pkgname = google-messages
diff --git a/PKGBUILD b/PKGBUILD
index 26e52af3d7c7..76b0c9dd0e7d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,37 +4,38 @@ pkgname='google-messages'
 pkgver=1.1.2
 pkgrel=1
 pkgdesc="A native-like OS X, Windows, & Linux desktop app for Google Messages"
-arch=('x86_64' 'i686' 'pentium4' 'aarch64')
+arch=('x86_64' 'i686' 'pentium4' 'armv7h' 'aarch64')
 url="https://www.messagesfordesktop.com/"
-license=('unknown')
-makedepends=('npm' 'nodejs')
+license=('custom')
+makedepends=('nodejs-nativefier')
 source=("google-messages.png::https://raw.githubusercontent.com/kelyvin/Google-Messages-For-Desktop/v$pkgver/android-messages-logo.png"
-        "google-messages.sh"
         "google-messages.desktop")
 sha256sums=('3c938c748fbef4cdd72e638b26aa35f3e2da8045a0c5490ede8b6ef5603f1b2c'
-            '803d148788b75176f8333077c08e9e25081127c30f0476809c131ef93d25a6b3'
             '6909e255521af089883f18740fc91c7743897c99d4ece0784b969cea5bc480ae')
 
 build() {
-	sudo npm install --global nativefier
-	nativefier --platform "linux" --icon google-messages.png --name "Google Messages" "https://messages.google.com/web" --honest --disable-dev-tools --single-instance --app-version $pkgver --build-version $pkgrel
-}
-
-package() {
 	if [ `uname -m` = "x86_64" ]; then
-	    _INSTARCH='x64'
+	    _NFARCH='x64'
 	elif [ `uname -m` = "i686" ] || [ `uname -m` = "pentium4" ]; then
-	    _INSTARCH='ia32'
+	    _NFARCH='ia32'
 	elif [ `uname -m` = "aarch64" ]; then
-	    _INSTARCH='arm64'
+	    _NFARCH='arm64'
+	elif [ `uname -m` = "armv7l" ]; then
+	    _NFARCH='armv7l'
 	else
-	    echo "Unknown architecture. Aborting"
+	    echo "Unsupported architecture. Aborting"
 	    exit 1
 	fi
+	nativefier --platform "linux" --icon google-messages.png --name "Google Messages" "https://messages.google.com/web" --honest --disable-dev-tools --single-instance --tray --app-version $pkgver --build-version $pkgrel --arch ${_NFARCH}
+}
 
+package() {
+	_INSTDIR=$(ls -l "${srcdir}" | grep "GoogleMessages-linux-" | awk '{print $9}')
 	mkdir -p "$pkgdir"/opt
-	mv GoogleMessages-linux-${_INSTARCH} "$pkgdir"/opt/google-messages
-	install -Dm755 google-messages.sh "$pkgdir"/usr/bin/google-messages
+	mv ${_INSTDIR} "$pkgdir"/opt/google-messages
+	mkdir -p "$pkgdir"/usr/bin
+	ln -s /opt/google-messages/GoogleMessages "$pkgdir"/usr/bin/google-messages
+	install -Dm644 "$pkgdir"/opt/google-messages/LICENSE "$pkgdir"/usr/share/licenses/google-messages/LICENSE
 	install -Dm644 google-messages.png "$pkgdir"/usr/share/pixmaps/google-messages.png
 	install -Dm644 google-messages.desktop "$pkgdir"/usr/share/applications/google-messages.desktop
 }
diff --git a/google-messages.sh b/google-messages.sh
deleted file mode 100755
index 4f6ca7231b27..000000000000
--- a/google-messages.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-cd /opt/google-messages
-/opt/google-messages/GoogleMessages