update to 2.3.2

3 files changed, 21 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0b972f4a7335..e1ae7d6be8a4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,21 @@
 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.1
-	pkgrel = 3
+	pkgver = 2.3.2
+	pkgrel = 1
 	url = https://github.com/redisviewer/RedisViewer
 	arch = x86_64
 	license = MIT
 	depends = hicolor-icon-theme
 	depends = bash
-	depends = electron8
+	depends = electron9
 	depends = glibc
-	provides = redis-viewer=2.3.1
+	provides = redis-viewer=2.3.2
 	conflicts = redis-viewer
-	source = redis-viewer-2.3.1.deb::https://github.com/redisviewer/RedisViewer/releases/download/v2.3.1/Redis.Viewer-2.3.1.deb
-	source = LICENSE::https://raw.githubusercontent.com/redisviewer/RedisViewer/v2.3.1/LICENSE
+	source = redis-viewer-2.3.2.deb::https://github.com/redisviewer/RedisViewer/releases/download/v2.3.2/Redis.Viewer-2.3.2.deb
+	source = LICENSE::https://raw.githubusercontent.com/redisviewer/RedisViewer/v2.3.2/LICENSE
 	source = redis-viewer.sh
-	sha256sums = 9a06f66d0afb4491c61d46d3ce64dac5c3d08db7e738d625afa1187d82d5720e
+	sha256sums = d67d3ba3a77d4cf4bd41139aa72c39c401e0f2f7d80075158b9f659ff2679365
 	sha256sums = 68f3ca5eaa3a59b7e01cbafc7848cb20ea108627ed0c94023e7536adfeeb3e89
-	sha256sums = 53979f6b74406057a8e9fc21cdbd14fcfd730c8c8847bcbd169dff65b8bb7783
+	sha256sums = baac66b85f91470eeb4f233da7aa1be5ef910d5bfcc71ea764a446f8dffb54dd
 
 pkgname = redis-viewer-bin
diff --git a/PKGBUILD b/PKGBUILD
index 1a7956af3aa2..925aaae95dfb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,31 +2,33 @@
 pkgname=redis-viewer-bin
 _pkgname=redisviewer
 _appname="Redis Viewer"
-pkgver=2.3.1
-pkgrel=3
+pkgver=2.3.2
+pkgrel=1
 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"
 license=('MIT')
 provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
-depends=('hicolor-icon-theme' 'bash' 'electron8' 'glibc')
+depends=('hicolor-icon-theme' 'bash' 'electron9' 'glibc')
 source=("${pkgname%-bin}-${pkgver}.deb::${url}/releases/download/v${pkgver}/${_appname// /.}-${pkgver}.deb"
     "LICENSE::https://raw.githubusercontent.com/redisviewer/RedisViewer/v${pkgver}/LICENSE"
     "${pkgname%-bin}.sh")
-sha256sums=('9a06f66d0afb4491c61d46d3ce64dac5c3d08db7e738d625afa1187d82d5720e'
+sha256sums=('d67d3ba3a77d4cf4bd41139aa72c39c401e0f2f7d80075158b9f659ff2679365'
             '68f3ca5eaa3a59b7e01cbafc7848cb20ea108627ed0c94023e7536adfeeb3e89'
-            '53979f6b74406057a8e9fc21cdbd14fcfd730c8c8847bcbd169dff65b8bb7783')
-prepare() {
+            'baac66b85f91470eeb4f233da7aa1be5ef910d5bfcc71ea764a446f8dffb54dd')
+build() {
     bsdtar -xf "${srcdir}/data.tar.xz"
     chmod 755 "${srcdir}/opt/${_appname}/resources/server/redismanager"
-    sed "s|\"/opt/${_appname}/${_pkgname}\" %U|${pkgname%-bin}|g;s|Utility|Utility;Development|g;s|${_pkgname}|${pkgname%-bin}|g" \
+    sed -e "s|\"/opt/${_appname}/${_pkgname}\" %U|${pkgname%-bin}|g" \
+        -e "s|Utility|Development|g" \
+        -e "s|${_pkgname}|${pkgname%-bin}|g" \
         -i "${srcdir}/usr/share/applications/${_pkgname}.desktop"
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
-    install -Dm644 "${srcdir}/opt/${_appname}/resources/app.asar" -t "${pkgdir}/opt/${pkgname%-bin}"
-    cp -r "${srcdir}/opt/${_appname}/resources/server" "${pkgdir}/opt/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/opt/${_appname}/resources/app.asar" -t "${pkgdir}/opt/${pkgname%-bin}/resources"
+    cp -r "${srcdir}/opt/${_appname}/resources/server" "${pkgdir}/opt/${pkgname%-bin}/resources"
     install -Dm644 "${srcdir}/usr/share/applications/${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname%-bin}.desktop"
     for _icons in 16x16 32x32 48x48 64x64 128x128 256x256 512x512 1024x1024;do
         install -Dm644 "${srcdir}/usr/share/icons/hicolor/${_icons}/apps/${_pkgname}.png" \
diff --git a/redis-viewer.sh b/redis-viewer.sh
index c112a046af74..e704781e7731 100644
--- a/redis-viewer.sh
+++ b/redis-viewer.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
-_ELECTRON=/usr/bin/electron8
-_ASAR=/opt/redis-viewer/app.asar
+_ELECTRON=/usr/bin/electron9
+_ASAR=/opt/redis-viewer/resources/app.asar
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
     exec ${_ELECTRON} ${_ASAR} "$@"
 else