diff options
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 12 | ||||
-rw-r--r-- | before-dawn.sh | 11 |
3 files changed, 15 insertions, 12 deletions
@@ -1,7 +1,7 @@ pkgbase = before-dawn pkgdesc = A desktop screensaver app using web technologies pkgver = 0.28.0 - pkgrel = 1 + pkgrel = 2 url = https://github.com/muffinista/before-dawn arch = any license = MIT @@ -16,6 +16,6 @@ pkgbase = before-dawn source = before-dawn.git::git+https://github.com/muffinista/before-dawn.git#tag=v0.28.0 source = before-dawn.sh sha256sums = SKIP - sha256sums = a0cc6826161c9d7f95d984bc8a6af91611cd42fc11d8af339a4362f2911848c6 + sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014 pkgname = before-dawn @@ -1,9 +1,10 @@ # Maintainer: zxp19821005 <zxp19821005 at 163 dot com> pkgname=before-dawn +_pkgname="Before Dawn" pkgver=0.28.0 _electronversion=28 _nodeversion=18 -pkgrel=1 +pkgrel=2 pkgdesc="A desktop screensaver app using web technologies" arch=('any') url="https://github.com/muffinista/before-dawn" @@ -25,7 +26,7 @@ source=( "${pkgname}.sh" ) sha256sums=('SKIP' - 'a0cc6826161c9d7f95d984bc8a6af91611cd42fc11d8af339a4362f2911848c6') + '0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014') _ensure_local_nvm() { export NVM_DIR="${srcdir}/.nvm" source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]] @@ -35,16 +36,19 @@ _ensure_local_nvm() { build() { sed -e "s|@electronversion@|${_electronversion}|" \ -e "s|@appname@|${pkgname}|g" \ - -e "s|@appasar@|app.asar|g" \ + -e "s|@runname@|app.asar|g" \ -i "${srcdir}/${pkgname}.sh" _ensure_local_nvm - gendesk -q -f -n --categories "Utility" --name "Before Dawn" --exec "${pkgname}" + gendesk -q -f -n --categories="Utility" --name="${_pkgname}" --exec="${pkgname} %U" cd "${srcdir}/${pkgname}.git" 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 npm_config_target="${SYSTEM_ELECTRON_VERSION}" export ELECTRONVERSION="${_electronversion}" + export npm_config_disturl=https://electronjs.org/headers + HOME="${srcdir}/.electron-gyp" npm ci sed '141,155d' -i package.json sed '124,139d' -i package.json diff --git a/before-dawn.sh b/before-dawn.sh index 3a12998e94ec..f9ced1432cfc 100644 --- a/before-dawn.sh +++ b/before-dawn.sh @@ -1,15 +1,14 @@ #!/bin/sh set -e _APPDIR="/usr/lib/@appname@" -_ASAR="${_APPDIR}/@appasar@" +_RUNNAME="${_APPDIR}/@runname@" export PATH="${_APPDIR}:${PATH}" export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}" -#export ELECTRON_IS_DEV=0 +export ELECTRON_IS_DEV=0 export NODE_ENV=production cd "${_APPDIR}" if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then - exec electron@electronversion@ "${_ASAR}" "$@" + exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $? else - exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@" -fi -exit
\ No newline at end of file + exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $? +fi
\ No newline at end of file |