fix errors

3 files changed, 24 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eb95554f9c3d..e8f7d8fbdc90 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = redis-viewer-bin
 	pkgdesc = A Redis visualization client tool that pursues ultimate performance, minimalist layout, efficient interaction, cross platform, and supports deserialization of Java bytecode.
 	pkgver = 2.3.2
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/redisviewer/RedisViewer
 	arch = x86_64
 	license = MIT
@@ -14,6 +14,6 @@ pkgbase = redis-viewer-bin
 	source = redis-viewer.sh
 	sha256sums = 05782f359b7e9b97027f2aacbe99f6345208e862ee3ebd1046e80a0cf074f844
 	sha256sums = 68f3ca5eaa3a59b7e01cbafc7848cb20ea108627ed0c94023e7536adfeeb3e89
-	sha256sums = 570271bd08501ca00e87e32da3b6a003d5dfbce25d9d051a01c5a433e7736a32
+	sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231
 
 pkgname = redis-viewer-bin
diff --git a/PKGBUILD b/PKGBUILD
index 5b97caa1c19c..8f647ba3a7a1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,8 @@ pkgname=redis-viewer-bin
 _pkgname=redisviewer
 _appname="Redis Viewer"
 pkgver=2.3.2
-pkgrel=2
+_electronversion=9
+pkgrel=3
 pkgdesc="A Redis visualization client tool that pursues ultimate performance, minimalist layout, efficient interaction, cross platform, and supports deserialization of Java bytecode."
 arch=('x86_64')
 url="https://github.com/redisviewer/RedisViewer"
@@ -12,7 +13,7 @@ provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
 depends=(
     'hicolor-icon-theme'
-    'electron9'
+    "electron${_electronversion}"
 )
 source=(
     "${pkgname%-bin}-${pkgver}.deb::${url}/releases/download/v${pkgver}/${_appname// /.}-${pkgver}.deb"
@@ -21,10 +22,14 @@ source=(
 )
 sha256sums=('05782f359b7e9b97027f2aacbe99f6345208e862ee3ebd1046e80a0cf074f844'
             '68f3ca5eaa3a59b7e01cbafc7848cb20ea108627ed0c94023e7536adfeeb3e89'
-            '570271bd08501ca00e87e32da3b6a003d5dfbce25d9d051a01c5a433e7736a32')
+            'd4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231')
 build() {
+    sed -e "s|@electronversion@|${_electronversion}|g" \
+        -e "s|@appname@|${pkgname%-bin}|g" \
+        -e "s|@appasar@|app.asar|g" \
+        -i "${srcdir}/${pkgname%-bin}.sh"
     bsdtar -xf "${srcdir}/data.tar.xz"
-    sed -e "s|\"/opt/${_appname}/${_pkgname}\" %U|${pkgname%-bin}|g" \
+    sed -e "s|\"/opt/${_appname}/${_pkgname}\"|${pkgname%-bin}|g" \
         -e "s|Utility|Development|g" \
         -e "s|${_pkgname}|${pkgname%-bin}|g" \
         -i "${srcdir}/usr/share/applications/${_pkgname}.desktop"
diff --git a/redis-viewer.sh b/redis-viewer.sh
index 370714bd1722..aacd8f895847 100644
--- a/redis-viewer.sh
+++ b/redis-viewer.sh
@@ -1,11 +1,15 @@
-#!/bin/bash
-_ELECTRON=/usr/bin/electron9
-APPDIR="/usr/lib/redis-viewer"
-export PATH="${APPDIR}:${PATH}"
-export LD_LIBRARY_PATH="${APPDIR}/swiftshader:${LD_LIBRARY_PATH}"
-_ASAR="${APPDIR}/app.asar"
+#!/bin/sh
+set -e
+_APPDIR="/usr/lib/@appname@"
+_ASAR="${_APPDIR}/@appasar@"
+export PATH="${_APPDIR}:${PATH}"
+export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
+export ELECTRON_IS_DEV=0
+export NODE_ENV=production
+cd "${_APPDIR}"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec ${_ELECTRON} ${_ASAR} "$@"
+    exec electron@electronversion@ "${_ASAR}" "$@"
 else
-    exec ${_ELECTRON} ${_ASAR} --no-sandbox "$@"
-fi
\ No newline at end of file
+    exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
+fi
+exit
\ No newline at end of file