new distrib packaging, asar compiled

4 files changed, 16 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c2ef870a6fa4..badd9da5e60d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,17 @@
 pkgbase = google-chat-linux-git
 	pkgdesc = Unofficial electron-based desktop client for Google Chat, electron included
 	pkgver = 0.3.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/squalou/google-chat-linux.git
 	arch = x86_64
 	arch = i686
 	license = WTFPL
 	makedepends = nodejs
 	makedepends = npm
+	makedepends = xz
+	makedepends = binutils
 	source = google-chat-linux-git::git+https://github.com/squalou/google-chat-linux.git#branch=master
-	source = google-chat-linux.desktop
-	source = google-chat-linux.sh
 	sha256sums = SKIP
-	sha256sums = e65b8b9b0556dded2521aa12b6d8e87c59f08a79b9e8cbee4273a7a659f72a6a
-	sha256sums = 8a4cbe222200bf214b817003b3598ce0e231956961bc0719b4a6a4cc32aa5b11
 
 pkgname = google-chat-linux-git
 
diff --git a/PKGBUILD b/PKGBUILD
index c85f9608aa00..4df5eeec5a50 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,48 +1,33 @@
 # Maintainer: Squalou <squalou.jenkins [at] gmail [dot] com>
 pkgname=google-chat-linux-git
 pkgver=0.3.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Unofficial electron-based desktop client for Google Chat, electron included"
 arch=('x86_64' 'i686')
 url="https://github.com/squalou/google-chat-linux.git"
 electron_version='electron@v7.1.0'
 license=('WTFPL')
-makedepends=('nodejs' 'npm')
+makedepends=('nodejs' 'npm' 'xz' 'binutils')
+appname="${pkgname%-git}"
 
 [[ $CARCH == 'x86_64' ]] && _arch='x64' || _arch='ia32'
 
-source=("${pkgname%}::git+${url}#branch=master"
-        "google-chat-linux.desktop"
-        "google-chat-linux.sh")
+source=("${pkgname%}::git+${url}#branch=master")
 
-sha256sums=('SKIP'
-        'e65b8b9b0556dded2521aa12b6d8e87c59f08a79b9e8cbee4273a7a659f72a6a'
-        '8a4cbe222200bf214b817003b3598ce0e231956961bc0719b4a6a4cc32aa5b11')
+sha256sums=('SKIP')
 
 build() {
-  npm install --prefix $srcdir/${pkgname}/ ${electron_version}
-  cd "$srcdir/${pkgname}"
-  npm install --production=true
-  rm -rf node_modules/7zip-bin
-  rm -rf node_modules/dmg-builder
-  rm -rf node_modules/app-builder-bin
-  rm -rf node_modules/app-builder-lib
-
+  npm install --prefix $srcdir/${appname}/ ${electron_version}
+  cd "$srcdir/${appname}"
+  npm run dist
+  cd dist
+  ar x `ls -1 ${appname}*.deb|head -n 1`
+  tar xJvf data.tar.xz
 
 }
 
 package() {
-  install -dm755 "${pkgdir}/usr/share"
-  install -dm755 "${pkgdir}/usr/share/pixmaps"
-  install -dm755 "${pkgdir}/usr/share/applications"
-  install -dm755 "${pkgdir}/usr/bin"
-  install -Dm644 "${srcdir}/${pkgname}/assets/icon/chat-favicon-no-new-256dp.png" "${pkgdir}/usr/share/icons/hicolor/256x256/apps/${pkgname%-git}.png"
-  install -Dm644 "${pkgname%-git}.desktop" "${pkgdir}/usr/share/applications/"
-  install -Dm755 "${pkgname%-git}.sh" "${pkgdir}/usr/bin/"
-  rm "${srcdir}/${pkgname}/${pkgname%-git}.sh"
-  rm -r "${srcdir}/${pkgname}/.git"
-  chmod 4755 "${srcdir}/${pkgname}/node_modules/electron/dist/chrome-sandbox"
-  mv "${srcdir}/${pkgname}" "${pkgdir}/usr/share/"
-  mv "${pkgdir}/usr/share/${pkgname}" "${pkgdir}/usr/share/${pkgname%-git}"
+    mv "${srcdir}/${appname}/dist/usr" "${pkgdir}/usr"
+    mv "${srcdir}/${appname}/dist/opt" "${pkgdir}/opt"
 }
 
diff --git a/google-chat-linux.desktop b/google-chat-linux.desktop
deleted file mode 100644
index a4a47d91cf26..000000000000
--- a/google-chat-linux.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Terminal=false
-Type=Application
-Name=Google Chat Linux
-Comment=Desktop client for Google Chat
-Exec=/usr/bin/google-chat-linux.sh
-Icon=google-chat-linux.png
-StartupWMClass=google-chat-linux
-Categories=Network;InstantMessaging;
diff --git a/google-chat-linux.sh b/google-chat-linux.sh
deleted file mode 100755
index 1a49ee3b6472..000000000000
--- a/google-chat-linux.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-NODE_PATH=/usr/share/google-chat-linux/node_modules/.bin
-export PATH=$NODE_PATH:$PATH
-
-cd /usr/share/google-chat-linux \
-  && ${NODE_PATH}/electron .
-