switch to working fork

5 files changed, 49 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dbf294578f71..f864aa87e2f0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,21 @@
 pkgbase = android-messages-desktop
 	pkgdesc = Android Messages as a cross-platform desktop app
-	pkgver = 3.1.0
-	pkgrel = 3
-	url = https://github.com/chrisknepper/android-messages-desktop
+	pkgver = 3.1.0+85+gf325f70
+	pkgrel = 1
+	url = https://github.com/OrangeDrangon/android-messages-desktop
 	arch = x86_64
 	license = MIT
-	makedepends = npm
+	makedepends = git
+	makedepends = yarn
 	depends = electron
 	depends = libnotify
 	depends = libappindicator-gtk3
-	source = android-messages-desktop-3.1.0.tar.gz::https://github.com/chrisknepper/android-messages-desktop/archive/v3.1.0.tar.gz
-	source = android-messages-desktop
-	sha256sums = e744e805a96a833b8b6fb59c8407dbc2b91d72eae7de9586d0bb42db87839ba8
+	source = git+https://github.com/OrangeDrangon/android-messages-desktop.git#commit=f325f709f7a3d9157404ff528e5c899a67254387
+	source = android-messages-desktop.sh
+	source = android-messages-desktop.desktop
+	sha256sums = SKIP
 	sha256sums = ef967c944762e6032c78db578be46a89e5eac2bc8bee856e21d67a6029e1dc69
+	sha256sums = 1bf16b8864712b0c1de72d8c3764db14b75ecf64dae44d206a26aa036ac53b1a
 
 pkgname = android-messages-desktop
 
diff --git a/.gitignore b/.gitignore
index 4b301aa450a5..35b30bc3ae0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@
 !.gitignore
 !PKGBUILD
 !.SRCINFO
-!android-messages-desktop
+!android-messages-desktop.sh
+!android-messages-desktop.desktop
diff --git a/PKGBUILD b/PKGBUILD
index d1d26d6f3e0f..19edd2341f58 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,50 @@
 # Maintainer: Mark Wagie <mark dot wagie at tutanota dot com>
 # Co-Maintainer: jswenson
-# Packager: Chris Knepper <chris82thekid at gmail dot com>
 pkgname=android-messages-desktop
-pkgver=3.1.0
-pkgrel=3
+pkgver=3.1.0+85+gf325f70
+pkgrel=1
 pkgdesc="Android Messages as a cross-platform desktop app"
 arch=('x86_64')
-url="https://github.com/chrisknepper/android-messages-desktop"
+#url="https://github.com/chrisknepper/android-messages-desktop"
+url="https://github.com/OrangeDrangon/android-messages-desktop"
 license=('MIT')
 depends=('electron' 'libnotify' 'libappindicator-gtk3')
-makedepends=('npm')
-source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
-        "$pkgname")
-sha256sums=('e744e805a96a833b8b6fb59c8407dbc2b91d72eae7de9586d0bb42db87839ba8'
-            'ef967c944762e6032c78db578be46a89e5eac2bc8bee856e21d67a6029e1dc69')
+makedepends=('git' 'yarn')
+_commit=f325f709f7a3d9157404ff528e5c899a67254387
+source=("git+$url.git#commit=$_commit"
+        "$pkgname.sh"
+        "$pkgname.desktop")
+sha256sums=('SKIP'
+            'ef967c944762e6032c78db578be46a89e5eac2bc8bee856e21d67a6029e1dc69'
+            '1bf16b8864712b0c1de72d8c3764db14b75ecf64dae44d206a26aa036ac53b1a')
+
+pkgver() {
+	cd "$srcdir/$pkgname"
+	git describe --tags | sed 's/^v//;s/-/+/g'
+}
 
 prepare() {
-	cd "$pkgname-$pkgver"
-
-	# Disable building of deb, AppImage and snap
-	sed -i '65,67d' package.json
+	cd "$srcdir/$pkgname"
 
-	# Use system electron
-	electronVer=$(tail /usr/lib/electron/version)
-	sed -i 's/"electron": "7.0.1"/"electron": "'$electronVer'"/g' package.json
+	# Disable building of dist packages
+	sed -i 's/"AppImage", "snap", "pacman", "deb", "rpm", "freebsd", "zip"/"dir"/g' \
+		electron-builder.js
 }
 
 build() {
-	cd "$pkgname-$pkgver"
-	HOME="$srcdir/.electron-gyp" npm install --cache "$srcdir/npm-cache"
-	npm run build
+	cd "$srcdir/$pkgname"
+	HOME="$srcdir/.electron-gyp" yarn --cache-folder "$srcdir/yarn-cache"
+	yarn run dist
 }
 
 package() {
-	cd "$pkgname-$pkgver"
+	cd "$srcdir/$pkgname"
 	install -d "$pkgdir/usr/lib/$pkgname"
 	cp -r dist/linux-unpacked/resources "$pkgdir/usr/lib/$pkgname"
 
-	install -Dm755 "$srcdir/$pkgname" -t "$pkgdir/usr/bin"
+	install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
+	install -Dm644 "$srcdir/$pkgname.desktop" -t "$pkgdir/usr/share/applications"
+	install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname"
 
 	for icon_size in 16 24 32 48 64 128 256 512 1024; do
 		icons_dir=/usr/share/icons/hicolor/${icon_size}x${icon_size}/apps
@@ -45,14 +52,4 @@ package() {
 		install -m644 resources/icons/${icon_size}x${icon_size}.png \
 			$pkgdir$icons_dir/$pkgname.png
 	done
-
-	install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname"
-
-	# Install desktop file from .pacman
-	cd dist
-	tar -xf "$pkgname-$pkgver.pacman"
-	sed -i 's|"/opt/Android Messages/'$pkgname'" %U|'$pkgname'|g' \
-		"usr/share/applications/$pkgname.desktop"
-	install -Dm644 "usr/share/applications/$pkgname.desktop" -t \
-		"$pkgdir/usr/share/applications"
 }
diff --git a/android-messages-desktop.desktop b/android-messages-desktop.desktop
new file mode 100644
index 000000000000..1f91f1fa2145
--- /dev/null
+++ b/android-messages-desktop.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Android Messages
+Exec=android-messages-desktop
+Terminal=false
+Type=Application
+Icon=android-messages-desktop
+StartupWMClass=Android Messages
+Comment=Messages for web, as a desktop app
+Categories=Internet;
diff --git a/android-messages-desktop b/android-messages-desktop.sh
index 76a9337d50ed..76a9337d50ed 100644
--- a/android-messages-desktop
+++ b/android-messages-desktop.sh