Update to 1.5.0

2 files changed, 25 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b9a408640897..2c523791f28d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ghetto-skype
 	pkgdesc = Web Skype + Tray Icon + Notifications
-	pkgver = 1.4.1
-	pkgrel = 3
+	pkgver = 1.5.0
+	pkgrel = 1
 	url = https://github.com/stanfieldr/ghetto-skype
 	install = ghetto-skype.install
 	arch = x86_64
@@ -9,8 +9,8 @@ pkgbase = ghetto-skype
 	makedepends = npm
 	depends = electron
 	optdepends = libappindicator-gtk2: Tray Icon support for certain DEs
-	source = https://github.com/stanfieldr/ghetto-skype/archive/v1.4.1.tar.gz
-	sha256sums = 0b89a6cb578a798498f65f51372c252c0e6a18f82e7f9e6887e5db12ef1f555c
+	source = https://github.com/stanfieldr/ghetto-skype/archive/v1.5.0.tar.gz
+	sha256sums = 597ba70f48ee34a1e256aef04ce2403e8bb696e85e6ac15f192ac10c4388325c
 
 pkgname = ghetto-skype
 
diff --git a/PKGBUILD b/PKGBUILD
index 1cacf997722e..dbe32a10926a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,8 @@
-# Maintainer: Nathan Lowe <techwiz96@gmail.com>
+# Maintainer: nerflad <nerflad@gmail.com>
 # Upstream URL: https://github.com/stanfieldr/ghetto-skype
-#
-# Based off of the PKGBUILD for atom-editor
-# https://aur.archlinux.org/packages/atom-editor/
-#
-# For improvements/fixes to this package, please send a pull request:
-# https://github.com/nlowe/aur-ghetto-skype
-
 pkgname=ghetto-skype
-pkgver=1.4.1
-pkgrel=3
+pkgver=1.5.0
+pkgrel=1
 pkgdesc='Web Skype + Tray Icon + Notifications'
 arch=('x86_64')
 url='https://github.com/stanfieldr/ghetto-skype'
@@ -19,28 +12,30 @@ optdepends=('libappindicator-gtk2: Tray Icon support for certain DEs')
 makedepends=('npm')
 install=ghetto-skype.install
 source=("https://github.com/stanfieldr/ghetto-skype/archive/v${pkgver}.tar.gz")
-sha256sums=('0b89a6cb578a798498f65f51372c252c0e6a18f82e7f9e6887e5db12ef1f555c')
+sha256sums=('597ba70f48ee34a1e256aef04ce2403e8bb696e85e6ac15f192ac10c4388325c')
 
 prepare() {
-  cd "ghetto-skype-$pkgver"
+    cd "${pkgname}-${pkgver}"
 
-  echo "Fetching node dependencies..."
-  npm install --production
+    sed -i src/assets/skype.desktop -e '/Exec/d'
+    echo 'Exec=/usr/bin/ghetto-skype' >> src/assets/skype.desktop
 }
 
-package() {
-  mkdir -p "$pkgdir/opt/ghetto-skype"
-  cp -a "$srcdir/ghetto-skype-$pkgver/." "$pkgdir/opt/ghetto-skype"
-
-  install -Dm644 "$srcdir/ghetto-skype-$pkgver/assets/skype.desktop" "$pkgdir/usr/share/applications/ghetto-skype.desktop"
-  install -Dm644 "$srcdir/ghetto-skype-$pkgver/assets/tray/skype.png" "$pkgdir/usr/share/pixmaps/ghetto-skype.png"
-  install -Dm644 "$srcdir/ghetto-skype-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+build() {
+    cd ${pkgname}-${pkgver}/src
+    npm install --production
+}
 
-  find "${pkgdir}" -type d -exec chmod 755 {} +
-  find "${pkgdir}" -type f -exec chmod 644 {} +
+package() {
+    mkdir "${pkgdir}/opt"
+    mv "${pkgname}-${pkgver}/src" "${pkgname}-${pkgver}/ghetto-skype"
+    cp -r "${pkgname}-${pkgver}/ghetto-skype" "${pkgdir}/opt/."
 
-  mkdir -p "$pkgdir/usr/bin"
-  echo -e "#!/bin/bash\ncd /opt/ghetto-skype && /usr/bin/electron /opt/ghetto-skype\n" >> "$pkgdir/usr/bin/ghetto-skype"
+    install -Dm0644 "${pkgname}-${pkgver}/ghetto-skype/assets/skype.desktop" "${pkgdir}/usr/share/applications/ghetto-skype.desktop"
+    install -Dm0644 "${pkgname}-${pkgver}/ghetto-skype/assets/tray/skype.png" "${pkgdir}/usr/share/pixmaps/ghetto-skype.png"
+    install -Dm0644 "${pkgname}-${pkgver}/LICENSE" "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
 
-  chmod 777 "$pkgdir/usr/bin/ghetto-skype"
+    mkdir -p "${pkgdir}/usr/bin"
+    echo -e "#!/bin/bash\n/usr/bin/electron /opt/ghetto-skype" >> "${pkgdir}/usr/bin/ghetto-skype"
+    chmod 777 "${pkgdir}/usr/bin/ghetto-skype"
 }