update to 0.7.2

3 files changed, 59 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2d815ae07c66..4efae8a978d4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
 pkgbase = waveterm-bin
-	pkgdesc = An open-source, cross-platform terminal for seamless workflows (binary w/o Electron.js)
-	pkgver = 0.5.3
+	pkgdesc = An open-source, cross-platform terminal for seamless workflows.Use system-wide electron.
+	pkgver = 0.7.2
 	pkgrel = 1
 	url = https://www.waveterm.dev
 	arch = x86_64
-	license = Apache
-	makedepends = unzip
-	makedepends = gendesk
-	source = https://dl.waveterm.dev/builds/waveterm-linux-x64-v0.5.3.zip
-	sha256sums = 318ec508b6cfa4de15c4f2789e68477ba64a3da1c07eb56382fd352ee95f5034
+	license = Apache-2.0
+	depends = electron29
+	source = waveterm-0.7.2.pacman::https://github.com/wavetermdev/waveterm/releases/download/v0.7.2/Wave-linux-x64-0.7.2.pacman
+	source = waveterm.sh
+	sha256sums = 0d51502325e67a1bfbfd511de9c9a33d1584e82e56f00cfbe7fda51bef25faba
+	sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8
 
 pkgname = waveterm-bin
diff --git a/PKGBUILD b/PKGBUILD
index 84316eb7d7e3..ad056cf0a9de 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,40 @@
-# Maintainer: criptixo <therealcriptixo@gmail.com>
+# Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
+# Contributor: criptixo <therealcriptixo@gmail.com>
 pkgname=waveterm-bin
-pkgver=0.5.3
+_pkgname=Wave
+pkgver=0.7.2
+_electronversion=29
 pkgrel=1
-pkgdesc='An open-source, cross-platform terminal for seamless workflows (binary w/o Electron.js)'
+pkgdesc='An open-source, cross-platform terminal for seamless workflows.Use system-wide electron.'
 arch=('x86_64')
 url="https://www.waveterm.dev"
-license=('Apache')
-depends=()
-makedepends=('unzip' 'gendesk')
-source=("https://dl.waveterm.dev/builds/waveterm-linux-x64-v0.5.3.zip")
-sha256sums=('318ec508b6cfa4de15c4f2789e68477ba64a3da1c07eb56382fd352ee95f5034')
-
-package() {
-  
-  # bin
-  mkdir -p ${pkgdir}/opt/waveterm
-  cp -r ${srcdir}/Wave-linux-x64/* ${pkgdir}/opt/waveterm/
-  chmod +x ${pkgdir}/opt/waveterm/Wave
-  mv ${pkgdir}/opt/waveterm/Wave ${pkgdir}/opt/waveterm/waveterm
-  mkdir -p ${pkgdir}/usr/bin/
-  ln -s /opt/waveterm/waveterm ${pkgdir}/usr/bin/waveterm
-
-  # license
-  mkdir -p ${pkgdir}/usr/share/licenses/waveterm
-  cp -r ${srcdir}/Wave-linux-x64/LICENSE ${pkgdir}/usr/share/licenses/waveterm/LICENSE
-
-  # desktop icon and entry
-  mkdir -p ${pkgdir}/usr/share/pixmaps/
-  cp -r ${srcdir}/Wave-linux-x64/resources/app/dist/870c6c70c952160273688bf919cfb761.svg ${pkgdir}/usr/share/pixmaps/waveterm.svg
-  gendesk
-  mkdir -p ${pkgdir}/usr/share/applications/
-  cp -r waveterm.desktop ${pkgdir}/usr/share/applications/waveterm.desktop 
+_ghurl="https://github.com/wavetermdev/waveterm"
+license=('Apache-2.0')
+depends=(
+    "electron${_electronversion}"
+)
+source=(
+    "${pkgname%-bin}-${pkgver}.pacman::${_ghurl}/releases/download/v${pkgver}/${_pkgname}-linux-x64-${pkgver}.pacman"
+    "${pkgname%-bin}.sh"
+)
+sha256sums=('0d51502325e67a1bfbfd511de9c9a33d1584e82e56f00cfbe7fda51bef25faba'
+            'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8')
+build() {
+    sed -e "s|@electronversion@|${_electronversion}|" \
+        -e "s|@appname@|${pkgname%-bin}|g" \
+        -e "s|@runname@|app.asar|g" \
+        -e "s|@options@|env ELECTRON_OZONE_PLATFORM_HINT=auto|g" \
+        -i "${srcdir}/${pkgname%-bin}.sh"
+    sed "s|/opt/${_pkgname}/${_pkgname}|${pkgname%-bin}|g;s|Icon=${_pkgname}|Icon=${pkgname%-bin}|g;s|TerminalEmulator|TerminalEmulator;Utility|g" \
+        -i "${srcdir}/usr/share/applications/${_pkgname}.desktop"
 }
+package() {
+    install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/opt/${_pkgname}/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname%-bin}"
+    cp -r "${srcdir}/opt/${_pkgname}/resources/app.asar.unpacked" -t "${pkgdir}/usr/lib/${pkgname%-bin}"
+    for _icons in 16x16 32x32 48x48 64x64 128x128 256x256 512x512 1024x1024;do
+        install -Dm644 "${srcdir}/usr/share/icons/hicolor/${_icons}/apps/${_pkgname}.png" \
+            "${pkgdir}/usr/share/icons/hicolor/${_icons}/apps/${pkgname%-bin}.png"
+    done
+    install -Dm644 "${srcdir}/usr/share/applications/${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname%-bin}.desktop"
+}
\ No newline at end of file
diff --git a/waveterm.sh b/waveterm.sh
new file mode 100644
index 000000000000..7ddcaab8d734
--- /dev/null
+++ b/waveterm.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+set -e
+_APPDIR="/usr/lib/@appname@"
+_RUNNAME="${_APPDIR}/@runname@"
+_OPTIONS="@options@"
+export PATH="${_APPDIR}:${PATH}"
+export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
+export ELECTRON_IS_DEV=0
+export ELECTRON_FORCE_IS_PACKAGED=true
+export NODE_ENV=production
+cd "${_APPDIR}"
+if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
+    exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "$@" || exit $?
+else
+    exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "$@" || exit $?
+fi
\ No newline at end of file