diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 17 | ||||
| -rw-r--r-- | fifo-browser.sh | 22 |
3 files changed, 27 insertions, 16 deletions
@@ -1,7 +1,7 @@ pkgbase = fifo-browser-bin pkgdesc = A modern web browser, built on top of modern web technologies such as Electron and React that is mean't to be secure. pkgver = 1.3.1 - pkgrel = 5 + pkgrel = 6 url = https://fifo.snaildos.com/ arch = x86_64 license = GPL3 @@ -18,6 +18,6 @@ pkgbase = fifo-browser-bin source = fifo-browser-1.3.1.AppImage::https://github.com/snaildos/Fifo-Browser/releases/download/v1.3.1/Fifo-1.3.1.AppImage source = fifo-browser.sh sha256sums = 68d59da728a07076d34dc05180d08d9e6b3740062590b996b6bd5c93a3072b18 - sha256sums = 2a4fc4deda76ddecc3da42baf75fe15beb77f67babfa06dc3f9c2d2e7f7248c8 + sha256sums = 5ce46265f0335b03568aa06f7b4c57c5f8ffade7a226489ea39796be91a511bf pkgname = fifo-browser-bin @@ -2,16 +2,17 @@ pkgname=fifo-browser-bin _pkgname=Fifo pkgver=1.3.1 -pkgrel=5 +_electronversion=20 +pkgrel=6 pkgdesc="A modern web browser, built on top of modern web technologies such as Electron and React that is mean't to be secure." arch=('x86_64') url="https://fifo.snaildos.com/" -_githuburl="https://github.com/snaildos/Fifo-Browser" +_ghurl="https://github.com/snaildos/Fifo-Browser" license=('GPL3') provides=("${pkgname%-bin}=${pkgver}") conflicts=("${pkgname%-bin}") depends=( - 'electron20' + "electron${_electronversion}" 'libx11' 'gdk-pixbuf2' 'libxext' @@ -23,15 +24,19 @@ makedepends=( 'squashfuse' ) source=( - "${pkgname%-bin}-${pkgver}.AppImage::${_githuburl}/releases/download/v${pkgver}/${_pkgname}-${pkgver}.AppImage" + "${pkgname%-bin}-${pkgver}.AppImage::${_ghurl}/releases/download/v${pkgver}/${_pkgname}-${pkgver}.AppImage" "${pkgname%-bin}.sh" ) sha256sums=('68d59da728a07076d34dc05180d08d9e6b3740062590b996b6bd5c93a3072b18' - '2a4fc4deda76ddecc3da42baf75fe15beb77f67babfa06dc3f9c2d2e7f7248c8') + '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|Browser;|Network;|g" -i "${srcdir}/squashfs-root/${pkgname%-browser-bin}.desktop" + sed "s|AppRun --no-sandbox|${pkgname%-bin}|g;s|Browser;|Network;|g" -i "${srcdir}/squashfs-root/${pkgname%-browser-bin}.desktop" } package() { install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}" diff --git a/fifo-browser.sh b/fifo-browser.sh index 1de24f315fc6..c77c53567639 100644 --- a/fifo-browser.sh +++ b/fifo-browser.sh @@ -1,11 +1,17 @@ -#!/bin/bash -_ELECTRON=/usr/bin/electron20 -APPDIR=/usr/lib/fifo-browser -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 |