to pack in asar

6 files changed, 39 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 49534a32c8ba..d0ae7b3001d3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,22 @@
 pkgbase = ghetto-skype-git
 	pkgdesc = Are you tired of a buggy 32 bit official Skype client? Then Ghetto Skype is for you!
-	pkgver = 1.4.1.r0.ga341103
+	pkgver = 1.4.1.r7.gdba086a
 	pkgrel = 1
 	url = https://github.com/stanfieldr/ghetto-skype
-	install = install
 	arch = any
 	license = GPLv3
+	makedepends = npm
+	makedepends = asar
 	depends = electron
-	depends = hicolor-icon-theme
-	depends = npm
 	provides = ghetto-skype
 	conflicts = ghetto-skype
+	options = !emptydirs
 	source = ghetto-skype-git::git+https://github.com/stanfieldr/ghetto-skype.git
-	source = desktop
-	source = sh
+	source = ghetto-skype.desktop
+	source = ghetto-skype
 	md5sums = SKIP
 	md5sums = d64f8096b45034b1af93134cfdaaeece
-	md5sums = a3a1b0db9f82c4893b99ad03ab2b9b94
+	md5sums = fd5e7e49294ee8dc3a171f882ce60a70
 
 pkgname = ghetto-skype-git
 
diff --git a/PKGBUILD b/PKGBUILD
index fc22a500244c..7ac4fc450efe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,41 +2,54 @@
 
 _pkgname=ghetto-skype
 pkgname=ghetto-skype-git
-pkgver=1.4.1.r0.ga341103
+pkgver=1.4.1.r7.gdba086a
 pkgrel=1
 pkgdesc="Are you tired of a buggy 32 bit official Skype client? Then Ghetto Skype is for you!"
 arch=("any")
 url="https://github.com/stanfieldr/ghetto-skype"
 license=("GPLv3")
-depends=("electron" "hicolor-icon-theme" "npm")
+depends=('electron')
+makedepends=('npm' 'asar')
 conflicts=('ghetto-skype')
 provides=('ghetto-skype')
+options=(!emptydirs)
 source=("${pkgname}::git+https://github.com/stanfieldr/ghetto-skype.git"
-	"desktop"
-	"sh")
-
+        'ghetto-skype.desktop'
+        'ghetto-skype')
 md5sums=('SKIP'
          'd64f8096b45034b1af93134cfdaaeece'
-         'a3a1b0db9f82c4893b99ad03ab2b9b94')
-
-install="install"
+         'fd5e7e49294ee8dc3a171f882ce60a70')
 
 pkgver() {
 	cd "${pkgname}"
 	git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//'
 }
 
-package() {
-	npm install -g --user root --prefix "${pkgdir}/usr" "${srcdir}/${pkgname}"
-	rmdir "${pkgdir}/usr/etc"
+prepare() {
+	cd "${pkgname}"
 
-	install -Dm0644 "desktop" "${pkgdir}/usr/share/applications/ghetto-skype.desktop"
-	install -Dm0755 "sh" "${pkgdir}/usr/bin/ghetto-skype"
+	sed -i \
+		-e 's/skype24.png/skype.png/' \
+		-e 's/skype24-1.png/skype-1.png/' \
+	app/tray.js
+}
 
+build() {
 	cd "${pkgname}"
 
-	install -Dm0644 "assets/tray/skype.png" "${pkgdir}/usr/share/pixmaps/ghetto-skype.png"
+	npm install --production
+
+	asar p . ../ghetto-skype.asar
+}
+
+package() {
+
+	install -Dm0755 -t "${pkgdir}/usr/bin" ghetto-skype
+	install -Dm0644 -t "${pkgdir}/usr/share/applications" ghetto-skype.desktop
+	install -Dm0644 -t "${pkgdir}/usr/share/licenses/${_pkgname}" "${pkgname}/LICENSE"
+
+	install -Dm0644 -t "${pkgdir}/usr/lib/ghetto-skype" ghetto-skype.asar
+
+	install -Dm0644 "${pkgname}/assets/tray/skype.png" "${pkgdir}/usr/share/pixmaps/ghetto-skype.png"
 
-	install -dm0755 "${pkgdir}/usr/share/licenses/${_pkgname}"
-	ln -s "/usr/lib/node_modules/${_pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
 }
diff --git a/ghetto-skype b/ghetto-skype
new file mode 100644
index 000000000000..d4054611c769
--- /dev/null
+++ b/ghetto-skype
@@ -0,0 +1,3 @@
+#!/usr/bin/sh
+
+exec electron /usr/lib/ghetto-skype/ghetto-skype.asar "$@"
diff --git a/desktop b/ghetto-skype.desktop
index ea250bdaefbb..ea250bdaefbb 100644
--- a/desktop
+++ b/ghetto-skype.desktop
diff --git a/install b/install
deleted file mode 100644
index 6c87527e21eb..000000000000
--- a/install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/sh b/sh
deleted file mode 100644
index 86fe2ebd28e1..000000000000
--- a/sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec electron --app=/usr/lib/node_modules/ghetto-skype "$@"