Avoid duplicate instances of nwjs

3 files changed, 17 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 31fbb7c9340f..ee4b1bf439d2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,15 @@
 pkgbase = kiss-gui
 	pkgdesc = The KISS GUI is the crossplatform configuration tool for the Flyduino flight control system like the KISSfc, KISScc and KISSfcV2F7
 	pkgver = 2.0.11
-	pkgrel = 1
-	url = https://github.com/flyduino/kiss-gui
+	pkgrel = 2
 	arch = x86_64
+	depends = nwjs-bin
 	options = !strip
-	source = https://github.com/flyduino/kiss-gui/releases/download/2.0.11/KISS-GUI_2.0.11-master_46e13e7-linux64.zip
-	source = https://raw.githubusercontent.com/flyduino/kissfc-chrome-gui/master/images/icon_128.png
+	source = kiss-gui-2.0.11.tar.gz::https://github.com/flyduino/kissfc-chrome-gui/archive/46e13e706106267e71536e210d547afb2deab3cc.tar.gz
 	source = kiss-gui.sh
 	source = kiss-gui.desktop
-	sha512sums = db8277486619d3fd2ae9f383c85770d9954c07a875cfcf8829fad0c63bfc3ac712145c5bef9d58c8dacfa7312cfd1be1aef6dc6aee362dab033828c584e84c74
-	sha512sums = 36af702cf64bc0606eaf01febd3ed7db47e327bfb68f10f23f65d36b9a9482038e22149711d5b1fbbeabc1a6fcef9de25e971aa7f67b475983fd9aa3c57ca22f
-	sha512sums = 7aaaeb1688560a0874e69455ce25f273fa03aa5ad3a41116f4a71cde49ccfe334c05c955384e3624f5a7fca1300461eec41540cd05a7d61a3343dac09b576497
+	sha512sums = 87c4309efef889673f69f13468ba41ac917b8839da88a85548498066c06749a1e6f180928b2aa9c56b1e88c255bc6be95ff798861a051aefd096738ce438ab17
+	sha512sums = 68c02635d1c6449c8aadf55dc156717b8393c422fe9bfb96a2263314762ec82b024dc5979e1cb5c275de49439a25a4d4b962c5e7b3b58406038a3673daf895f0
 	sha512sums = 5a43483c365a1b1134bdd176be481a0400d3807b270cf0a31a575d5a7b0de167db6d1cd182ee9443cc0c86c77fbe14bb66bb1147c230f994aab36540687536ae
 
 pkgname = kiss-gui
diff --git a/PKGBUILD b/PKGBUILD
index d3a68456c73e..d309e7a8b12d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,31 +3,26 @@
 pkgname=kiss-gui
 arch=(x86_64)
 pkgver=2.0.11
-pkgrel=1
-_commit=46e13e7
+pkgrel=2
 pkgdesc="The KISS GUI is the crossplatform configuration tool for the Flyduino flight control system like the KISSfc, KISScc and KISSfcV2F7"
-url="https://github.com/flyduino/kiss-gui"
+pkgurl="https://github.com/flyduino/kissfc-chrome-gui"
+_tag=46e13e706106267e71536e210d547afb2deab3cc # Commit, because this release is untagged
 
-source=("$url/releases/download/$pkgver/KISS-GUI_$pkgver-master_$_commit-linux64.zip"
-        "https://raw.githubusercontent.com/flyduino/kissfc-chrome-gui/master/images/icon_128.png"
+depends=('nwjs-bin')
+source=($pkgname-$pkgver.tar.gz::"$pkgurl/archive/$_tag.tar.gz"
         "$pkgname.sh"
         "$pkgname.desktop")
-sha512sums=('db8277486619d3fd2ae9f383c85770d9954c07a875cfcf8829fad0c63bfc3ac712145c5bef9d58c8dacfa7312cfd1be1aef6dc6aee362dab033828c584e84c74'
-            '36af702cf64bc0606eaf01febd3ed7db47e327bfb68f10f23f65d36b9a9482038e22149711d5b1fbbeabc1a6fcef9de25e971aa7f67b475983fd9aa3c57ca22f'
-            '7aaaeb1688560a0874e69455ce25f273fa03aa5ad3a41116f4a71cde49ccfe334c05c955384e3624f5a7fca1300461eec41540cd05a7d61a3343dac09b576497'
+sha512sums=('87c4309efef889673f69f13468ba41ac917b8839da88a85548498066c06749a1e6f180928b2aa9c56b1e88c255bc6be95ff798861a051aefd096738ce438ab17'
+            '68c02635d1c6449c8aadf55dc156717b8393c422fe9bfb96a2263314762ec82b024dc5979e1cb5c275de49439a25a4d4b962c5e7b3b58406038a3673daf895f0'
             '5a43483c365a1b1134bdd176be481a0400d3807b270cf0a31a575d5a7b0de167db6d1cd182ee9443cc0c86c77fbe14bb66bb1147c230f994aab36540687536ae')
 options=(!strip)
 
 package() {
-  cd KISS-GUI
   install -d "$pkgdir/usr/share/$pkgname/"
-  cp -a * "$pkgdir/usr/share/$pkgname/"
-
-  install -D "$srcdir/icon_128.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
-
-  install -D "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
-
+  cp -r $srcdir/kissfc-chrome-gui-$_tag/* "$pkgdir/usr/share/$pkgname/"
+  
   install -d "$pkgdir/usr/bin/"
   install -Dm 755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
+  install -D "$srcdir/kissfc-chrome-gui-$_tag/images/icon_128.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
+  install -D "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
 }
-
diff --git a/kiss-gui.sh b/kiss-gui.sh
index a22a7db7f45d..26098828696f 100644
--- a/kiss-gui.sh
+++ b/kiss-gui.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-/usr/share/kiss-gui/kiss-gui
+nw /usr/share/kiss-gui