update to 0.9.2

3 files changed, 34 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 06d19f08ecfb..bacbf1e63d45 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
 pkgbase = thoughts-bin
 	pkgdesc = 一个还算强大的Web思维导图。A relatively powerful web mind map.
-	pkgver = 0.9.0
+	pkgver = 0.9.2
 	pkgrel = 1
 	url = https://wanglin2.github.io/mind-map/#/index
 	arch = x86_64
 	license = MIT
 	makedepends = squashfuse
-	depends = electron
+	depends = electron25
 	depends = hicolor-icon-theme
 	depends = libx11
 	depends = gdk-pixbuf2
@@ -14,13 +14,13 @@ pkgbase = thoughts-bin
 	depends = libdbusmenu-glib
 	depends = gtk2
 	depends = dbus-glib
-	provides = thoughts=0.9.0
+	provides = thoughts=0.9.2
 	conflicts = thoughts
-	source = thoughts-0.9.0.AppImage::https://github.com/wanglin2/mind-map/releases/download/electron_0.9.0/-0.9.0.AppImage
-	source = LICENSE::https://raw.githubusercontent.com/wanglin2/mind-map/electron_0.9.0/LICENSE
+	source = thoughts-0.9.2.AppImage::https://github.com/wanglin2/mind-map/releases/download/electron-0.9.2/-0.9.2.AppImage
+	source = LICENSE-0.9.2::https://raw.githubusercontent.com/wanglin2/mind-map/electron-0.9.2/LICENSE
 	source = thoughts.sh
-	sha256sums = 1f7b73075f4cdd8e50ec494190d0ba5c8c7d72f470a9d3544b9ad04ac9f69ab2
+	sha256sums = 225197c56ef546f8cdf560d1b849927b124373d72af1d4cedfeb41fff2403341
 	sha256sums = 8a19b651678a6a644640524d984ed89d0b9a78c662545715218a05130c7329c7
-	sha256sums = c36118c1c69c968ba18d7be76b0869e0b15668b678f234bb8749d47f43dda039
+	sha256sums = 5ce46265f0335b03568aa06f7b4c57c5f8ffade7a226489ea39796be91a511bf
 
 pkgname = thoughts-bin
diff --git a/PKGBUILD b/PKGBUILD
index 18f460f0b7ec..252f81588dfc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,7 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=thoughts-bin
-pkgver=0.9.0
+pkgver=0.9.2
+_electronversion=25
 pkgrel=1
 pkgdesc="一个还算强大的Web思维导图。A relatively powerful web mind map."
 arch=("x86_64")
@@ -10,7 +11,7 @@ license=("MIT")
 provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
 depends=(
-    'electron'
+    "electron${_electronversion}"
     'hicolor-icon-theme'
     'libx11'
     'gdk-pixbuf2'
@@ -23,17 +24,21 @@ makedepends=(
     'squashfuse'
 )
 source=(
-    "${pkgname%-bin}-${pkgver}.AppImage::${_ghurl}/releases/download/electron_${pkgver}/-${pkgver}.AppImage"
-    "LICENSE::https://raw.githubusercontent.com/wanglin2/mind-map/electron_${pkgver}/LICENSE"
+    "${pkgname%-bin}-${pkgver}.AppImage::${_ghurl}/releases/download/electron-${pkgver}/-${pkgver}.AppImage"
+    "LICENSE-${pkgver}::https://raw.githubusercontent.com/wanglin2/mind-map/electron-${pkgver}/LICENSE"
     "${pkgname%-bin}.sh"
 )
-sha256sums=('1f7b73075f4cdd8e50ec494190d0ba5c8c7d72f470a9d3544b9ad04ac9f69ab2'
+sha256sums=('225197c56ef546f8cdf560d1b849927b124373d72af1d4cedfeb41fff2403341'
             '8a19b651678a6a644640524d984ed89d0b9a78c662545715218a05130c7329c7'
-            'c36118c1c69c968ba18d7be76b0869e0b15668b678f234bb8749d47f43dda039')
+            '5ce46265f0335b03568aa06f7b4c57c5f8ffade7a226489ea39796be91a511bf')
 build() {
+    sed -e "s|@electronversion@|${_electronversion}|g" \
+        -e "s|@appname@|${pkgname%-bin}|g" \
+        -e "s|@appasar@|app.asar|g" \
+        -i "${srcdir}/${pkgname%-bin}.sh"
     chmod a+x "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage"
     "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage" --appimage-extract > /dev/null
-    sed "s|AppRun --no-sandbox %U|${pkgname%-bin}|g;s|Utilities|Utility|g" -i "${srcdir}/squashfs-root/${pkgname%-bin}.desktop"
+    sed "s|AppRun --no-sandbox|${pkgname%-bin}|g;s|Utilities|Utility|g" -i "${srcdir}/squashfs-root/${pkgname%-bin}.desktop"
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
@@ -44,5 +49,5 @@ package() {
         install -Dm644 "${srcdir}/squashfs-root/usr/share/icons/hicolor/${_icons}/apps/${pkgname%-bin}.png" \
             -t "${pkgdir}/usr/share/icons/hicolor/${_icons}/apps"
     done
-    install -Dm644 "${srcdir}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
+    install -Dm644 "${srcdir}/LICENSE-${pkgver}" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
\ No newline at end of file
diff --git a/thoughts.sh b/thoughts.sh
index df59255254b9..c77c53567639 100644
--- a/thoughts.sh
+++ b/thoughts.sh
@@ -1,11 +1,17 @@
-#!/bin/bash
-_ELECTRON=/usr/bin/electron
-APPDIR="/usr/lib/thoughts"
-export PATH="${APPDIR}:${PATH}"
-export LD_LIBRARY_PATH="${APPDIR}/lib:${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
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec ${_ELECTRON} ${_ASAR} "$@"
+    cd "${_APPDIR}"
+    exec electron@electronversion@ "${_ASAR}" "$@"
+    exit
 else
-    exec ${_ELECTRON} ${_ASAR} --no-sandbox "$@"
+    cd "${_APPDIR}"
+    exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
+    exit
 fi
\ No newline at end of file