update to 4.0.0.canary.5.r250.ga1da6e79

3 files changed, 63 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fc8bb7a64d1d..a4944f159c1e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = hyper-git
 	pkgdesc = A terminal built on web technologies
-	pkgver = 4.0.0.canary.5.r155.g3da89a87
+	pkgver = 4.0.0.canary.5.r250.ga1da6e79
 	pkgrel = 1
 	url = https://hyper.is/
 	arch = any
@@ -8,9 +8,10 @@ pkgbase = hyper-git
 	makedepends = git
 	makedepends = npm>=9.8.1
 	makedepends = yarn
-	makedepends = nodejs>=18.18.0
+	makedepends = nvm
 	makedepends = python>=3.8
 	makedepends = libarchive
+	makedepends = libicns
 	depends = bash
 	depends = python
 	depends = alsa-lib
@@ -39,7 +40,9 @@ pkgbase = hyper-git
 	depends = hicolor-icon-theme
 	provides = hyper
 	conflicts = hyper
-	source = hyper.git::git+https://github.com/vercel/hyper.git
+	source = hyper::git+https://github.com/vercel/hyper.git
+	source = hyper.sh
 	sha256sums = SKIP
+	sha256sums = 8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84
 
 pkgname = hyper-git
diff --git a/PKGBUILD b/PKGBUILD
index 6748261c89a8..3feb4860324f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,31 +7,61 @@
 # Contributer: auk
 pkgname=hyper-git
 _pkgname=Hyper
-pkgver=4.0.0.canary.5.r155.g3da89a87
+pkgver=4.0.0.canary.5.r250.ga1da6e79
+_electronversion=24
 pkgrel=1
 pkgdesc="A terminal built on web technologies"
 arch=('any')
 url="https://hyper.is/"
-_githuburl="https://github.com/vercel/hyper"
+_ghurl="https://github.com/vercel/hyper"
 license=('MIT')
 depends=('bash' 'python' 'alsa-lib' 'libxfixes' 'cairo' 'libxcb' 'glibc' 'nspr' 'at-spi2-core' 'pango' 'nss' 'libx11' 'libcups' 'expat' \
     'libxcomposite' 'gtk3' 'libxkbcommon' 'gcc-libs' 'libxext' 'mesa' 'libxdamage' 'libxrandr' 'libdrm' 'glib2' 'dbus' 'hicolor-icon-theme')
-makedepends=('git' 'npm>=9.8.1' 'yarn' 'nodejs>=18.18.0' 'python>=3.8' 'libarchive')
+makedepends=(
+    'git'
+    'npm>=9.8.1'
+    'yarn'
+    'nvm'
+    'python>=3.8'
+    'libarchive'
+    'libicns'
+)
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
-source=("${pkgname//-/.}::git+${_githuburl}.git")
-sha256sums=('SKIP')
+source=(
+    "${pkgname%-git}::git+${_ghurl}.git"
+    "${pkgname%-git}.sh"
+)
+sha256sums=('SKIP'
+            '8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84')
 pkgver() {
-    cd "${srcdir}/${pkgname//-/.}"
+    cd "${srcdir}/${pkgname%-git}"
     printf "%s" "$(git describe --tags | sed 's/\w\+\///g;s/\([^-]*-g\)/r\1/;s/-/./g;s/v//g')"
 }
+_ensure_local_nvm() {
+    export NVM_DIR="${srcdir}/.nvm"
+    source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
+    nvm install 18
+    nvm use 18
+}
 build() {
+    sed -e "s|@electronversion@|${_electronversion}|" \
+        -e "s|@appname@|${pkgname%-git}|g" \
+        -e "s|@appasar@|app|g" \
+        -i "${srcdir}/${pkgname%-git}.sh"
+    _ensure_local_nvm
     gendesk -q -f -n --categories "System;Utility" --name "${_pkgname}" --exec "${pkgname%-git} --no-sandbox %U"
-    cd "${srcdir}/${pkgname//-/.}"
+    cd "${srcdir}/${pkgname%-git}"
+    rm -rf .yarnrc
     sed -e '/"deb",/d' -e '/"rpm",/d' -e '/"snap",/d' -e '/"pacman"/d' -e 's|"AppImage",|"AppImage"|g' -i electron-builder.json
-    yarn install
+    export npm_config_build_from_source=true
+    export npm_config_cache="${srcdir}/.npm_cache"
+    export ELECTRON_SKIP_BINARY_DOWNLOAD=1
+    export SYSTEM_ELECTRON_VERSION="$(electron${_electronversion} -v | sed 's/v//g')"
+    export ELECTRONVERSION="${_electronversion}"
+    yarn install --cache-folder "${srcdir}/.yarn_cache"
     yarn run dist
-    cd "${srcdir}/${pkgname//-/.}/dist/.icon-set"
+    cd "${srcdir}/${pkgname%-git}/dist/.icon-set"
     cp icon_32.png icon_32x32.png
     cp icon_64.png icon_64x64.png
     cp icon_128.png icon_128x128.png
@@ -42,11 +72,11 @@ build() {
 package() {
     install -Dm755 -d "${pkgdir}/"{opt/"${pkgname%-git}",usr/bin}
     ln -sf "/opt/${pkgname%-git}/${pkgname%-git}" "${pkgdir}/usr/bin/${pkgname%-git}"
-    cp -r "${srcdir}/${pkgname//-/.}/dist/linux-unpacked/"* "${pkgdir}/opt/${pkgname%-git}"
+    cp -r "${srcdir}/${pkgname%-git}/dist/linux-unpacked/"* "${pkgdir}/opt/${pkgname%-git}"
     for _icons in 16x16 32x32 48x48 64x64 128x128 256x256 512x512 1024x1024;do
-        install -Dm644 "${srcdir}/${pkgname//-/.}/dist/.icon-set/icon_${_icons}.png" \
+        install -Dm644 "${srcdir}/${pkgname%-git}/dist/.icon-set/icon_${_icons}.png" \
             "${pkgdir}/usr/share/icons/hicolor/${_icons}/apps/${pkgname%-git}.png"
     done
     install -Dm644 "${srcdir}/${pkgname%-git}.desktop" -t "${pkgdir}/usr/share/applications"
-    install -Dm644 "${srcdir}/${pkgname//-/.}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
-}
+    install -Dm644 "${srcdir}/${pkgname%-git}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}
\ No newline at end of file
diff --git a/hyper.sh b/hyper.sh
new file mode 100644
index 000000000000..2ec4412e5c4f
--- /dev/null
+++ b/hyper.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+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
+    cd "${_APPDIR}"
+    exec electron@electronversion@ "${_ASAR}" "$@"
+else
+    cd "${_APPDIR}"
+    exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
+fi
\ No newline at end of file