fix errors

3 files changed, 29 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 56ce62d39e96..cc625111f2e6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
 pkgbase = string-file-manager-bin
 	pkgdesc = File manager for Linux - Built with Electron
 	pkgver = 1.0.3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/Michael-Vanderford/electron-file-manager
 	arch = x86_64
 	license = GPL3
-	depends = bash
 	depends = electron26
 	depends = hicolor-icon-theme
 	depends = baobab
@@ -14,6 +13,6 @@ pkgbase = string-file-manager-bin
 	source = string-file-manager-1.0.3.deb::https://github.com/Michael-Vanderford/electron-file-manager/releases/download/string-file-manager-v1.0.3/string-file-manager_1.0.3_amd64.deb
 	source = string-file-manager.sh
 	sha256sums = cb88a554fd0f2885dc08e287e23e7bf71ba2e613fcb2304899a67db3a2dd5a21
-	sha256sums = 9e0e6e926d28bac416cb4937bf20a71ab778b2a7632c2705253abbeb76c7ff1d
+	sha256sums = 8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84
 
 pkgname = string-file-manager-bin
diff --git a/PKGBUILD b/PKGBUILD
index f862c8391404..4ea8c3f9cba1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,36 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=string-file-manager-bin
 pkgver=1.0.3
-pkgrel=1
+_electronversion=26
+pkgrel=2
 pkgdesc="File manager for Linux - Built with Electron"
 arch=('x86_64')
 url="https://github.com/Michael-Vanderford/electron-file-manager"
 license=('GPL3')
 conflicts=("${pkgname%-bin}")
 provides=("${pkgname%-bin}=${pkgver}")
-depends=('bash' 'electron26' 'hicolor-icon-theme' 'baobab')
-source=("${pkgname%-bin}-${pkgver}.deb::${url}/releases/download/${pkgname%-bin}-v${pkgver}/${pkgname%-bin}_${pkgver}_amd64.deb"
-    "${pkgname%-bin}.sh")
+depends=(
+    "electron${_electronversion}"
+    'hicolor-icon-theme'
+    'baobab'
+)
+source=(
+    "${pkgname%-bin}-${pkgver}.deb::${url}/releases/download/${pkgname%-bin}-v${pkgver}/${pkgname%-bin}_${pkgver}_amd64.deb"
+    "${pkgname%-bin}.sh"
+)
 sha256sums=('cb88a554fd0f2885dc08e287e23e7bf71ba2e613fcb2304899a67db3a2dd5a21'
-            '9e0e6e926d28bac416cb4937bf20a71ab778b2a7632c2705253abbeb76c7ff1d')
+            '8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84')
 build() {
+    sed -e "s|@electronversion@|${_electronversion}|" \
+        -e "s|@appname@|${pkgname%-bin}|g" \
+        -e "s|@appasar@|app.asar|g" \
+        -i "${srcdir}/${pkgname%-bin}.sh"
     bsdtar -xf "${srcdir}/data.tar.xz"
     sed "s|/opt/${pkgname%-bin}/${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/${pkgname%-bin}/resources/"* -t "${pkgdir}/opt/${pkgname%-bin}/resources"
+    install -Dm644 "${srcdir}/opt/${pkgname%-bin}/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname%-bin}"
     for _icons in 16x16 32x32 48x48 64x64 128x128 256x256;do
         install -Dm644 "${srcdir}/usr/share/icons/hicolor/${_icons}/apps/${pkgname%-bin}.png" \
             -t "${pkgdir}/usr/share/icons/hicolor/${_icons}/apps"
diff --git a/string-file-manager.sh b/string-file-manager.sh
index facab56b3caf..2ec4412e5c4f 100644
--- a/string-file-manager.sh
+++ b/string-file-manager.sh
@@ -1,11 +1,14 @@
 #!/bin/bash
-_ELECTRON=/usr/bin/electron26
-APPDIR="/opt/string-file-manager"
-export PATH="${APPDIR}:${APPDIR}/usr/sbin:${PATH}"
-export LD_LIBRARY_PATH="${APPDIR}/usr/lib":"${APPDIR}/swiftshader":"${LD_LIBRARY_PATH}"
-_ASAR="${APPDIR}/resources/app.asar"
+set -e
+_APPDIR="/usr/lib/@appname@"
+export PATH="${_APPDIR}:${PATH}"
+export ELECTRON_IS_DEV=0
+export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
+_ASAR="${_APPDIR}/@appasar@"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec ${_ELECTRON} ${_ASAR} "$@"
+    cd "${_APPDIR}"
+    exec electron@electronversion@ "${_ASAR}" "$@"
 else
-    exec ${_ELECTRON} ${_ASAR} --no-sandbox "$@"
+    cd "${_APPDIR}"
+    exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
 fi
\ No newline at end of file