fix errors

3 files changed, 28 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 831c44a350fb..c4d200ec286e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,11 @@
 pkgbase = pennywise-bin
 	pkgdesc = Cross-platform application to open any website or media in a floating window
 	pkgver = 0.8.0
-	pkgrel = 6
+	pkgrel = 7
 	url = https://github.com/kamranahmedse/pennywise
 	arch = i686
 	arch = x86_64
 	license = MIT
-	depends = bash
 	depends = hicolor-icon-theme
 	depends = electron5
 	optdepends = chromium: for Open with Pennywise Chrome extension
@@ -19,7 +18,7 @@ pkgbase = pennywise-bin
 	source = LICENSE.md::https://raw.githubusercontent.com/kamranahmedse/pennywise/v0.8.0/license.md
 	source = pennywise.sh
 	sha256sums = b41ccd76edcf9e9af64581622b1d6dc1de7ed55a96548c4af8c43d32cd764b0b
-	sha256sums = aa64a767c78062a80d33bce41de9ed9991d427d466fadabfa719781252867467
+	sha256sums = 7f81f1416ca73154a28fba4e00d98e3d28aea93771e6de8e449ddbf8e6d65363
 	source_i686 = pennywise-0.8.0-i686.deb::https://github.com/kamranahmedse/pennywise/releases/download/v0.8.0/pennywise_0.8.0_i386.deb
 	sha256sums_i686 = df794adfb3fd28cb68beabe59cadfc000c0b20c83bb38f064d9409a7951b6799
 	source_x86_64 = pennywise-0.8.0-x86_64.deb::https://github.com/kamranahmedse/pennywise/releases/download/v0.8.0/pennywise_0.8.0_amd64.deb
diff --git a/PKGBUILD b/PKGBUILD
index 4730ee8eeb08..31594a546057 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,45 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 # Contributor: Mark Wagie <mark dot wagie at tutanota dot com>
 pkgname=pennywise-bin
-_appname=Pennywise
+_pkgname=Pennywise
 pkgver=0.8.0
-pkgrel=6
+pkgrel=7
 pkgdesc="Cross-platform application to open any website or media in a floating window"
 arch=('i686' 'x86_64')
 url="https://github.com/kamranahmedse/pennywise"
 license=('MIT')
 provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
-depends=('bash' 'hicolor-icon-theme' 'electron5')
-optdepends=('chromium: for Open with Pennywise Chrome extension'
-			'google-chrome: for Open with Pennywise Chrome Extension'
-			'firefox: for Open with Pennywise Firefox Add-on'
-			'pepper-flash: for Adobe Flash support in Chromium'
-			'flashplugin: for Adobe Flash support in Firefox')
+depends=(
+	'hicolor-icon-theme'
+	'electron5'
+)
+optdepends=(
+	'chromium: for Open with Pennywise Chrome extension'
+	'google-chrome: for Open with Pennywise Chrome Extension'
+	'firefox: for Open with Pennywise Firefox Add-on'
+	'pepper-flash: for Adobe Flash support in Chromium'
+	'flashplugin: for Adobe Flash support in Firefox'
+)
 source_i686=("${pkgname%-bin}-${pkgver}-i686.deb::${url}/releases/download/v${pkgver}/${pkgname%-bin}_${pkgver}_i386.deb")
 source_x86_64=("${pkgname%-bin}-${pkgver}-x86_64.deb::${url}/releases/download/v${pkgver}/${pkgname%-bin}_${pkgver}_amd64.deb")
-source=("LICENSE.md::https://raw.githubusercontent.com/kamranahmedse/pennywise/v${pkgver}/license.md"
-	"${pkgname%-bin}.sh")
+source=(
+	"LICENSE.md::https://raw.githubusercontent.com/kamranahmedse/pennywise/v${pkgver}/license.md"
+	"${pkgname%-bin}.sh"
+)
 sha256sums=('b41ccd76edcf9e9af64581622b1d6dc1de7ed55a96548c4af8c43d32cd764b0b'
-            'aa64a767c78062a80d33bce41de9ed9991d427d466fadabfa719781252867467')
+            '7f81f1416ca73154a28fba4e00d98e3d28aea93771e6de8e449ddbf8e6d65363')
 sha256sums_i686=('df794adfb3fd28cb68beabe59cadfc000c0b20c83bb38f064d9409a7951b6799')
 sha256sums_x86_64=('02d5f5ea3bf0b934d650cbb75c3cb43ab62b3d1c48c733b2f85816ccc8736191')
 build() {
 	bsdtar -xf "${srcdir}/data.tar.xz"
-	sed "s|\"/opt/${_appname}/${pkgname%-bin}\" %U|${pkgname%-bin}|g" -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
+	sed "s|\"/opt/${_pkgname}/${pkgname%-bin}\" %U|${pkgname%-bin}|g" -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
 }
 package() {
 	install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
-	install -Dm644 "${srcdir}/opt/${_appname}/resources/"*.asar -t "${pkgdir}/opt/${pkgname%-bin}/resources"
-    cp -r "${srcdir}/opt/${_appname}/resources/inspector" "${pkgdir}/opt/${pkgname%-bin}/resources"
+	install -Dm644 "${srcdir}/opt/${_pkgname}/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname%-bin}"
+	install -Dm644 "${srcdir}/opt/${_pkgname}/swiftshader/"* -t "${pkgdir}/usr/lib/${pkgname%-bin}/swiftshader"
+    cp -r "${srcdir}/opt/${_pkgname}/resources/inspector" "${pkgdir}/usr/lib/${pkgname%-bin}"
     for _icons in 16x16 24x24 32x32 48x48 64x64 96x96 128x128 256x256 512x512;do
       install -Dm644 "${srcdir}/usr/share/icons/hicolor/${_icons}/apps/${pkgname%-bin}.png" \
         -t "${pkgdir}/usr/share/icons/hicolor/${_icons}/apps"
diff --git a/pennywise.sh b/pennywise.sh
index b29bd79c54fc..b9c96f8f17f4 100644
--- a/pennywise.sh
+++ b/pennywise.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 _ELECTRON=/usr/bin/electron5
-_ASAR="/opt/pennywise/resources/app.asar"
+APPDIR="/usr/lib/pennywise"
+export PATH="${APPDIR}:${PATH}"
+export LD_LIBRARY_PATH="${APPDIR}/swiftshader:${LD_LIBRARY_PATH}"
+_ASAR="${APPDIR}/app.asar"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
     exec ${_ELECTRON} ${_ASAR} "$@"
 else