diff options
| author | zxp19821005 | 2024-02-27 10:35:16 +0800 |
|---|---|---|
| committer | zxp19821005 | 2024-02-27 10:35:16 +0800 |
| commit | 0ee08f9027debbd4aa273b1894a87c76c61305fb (patch) | |
| tree | f19dbc0271577447fa46c48a359fd57453141a86 | |
| parent | 5fdcba8125dde87c597766b84517caf3d4650da1 (diff) | |
| download | aur-0ee08f9027debbd4aa273b1894a87c76c61305fb.tar.gz | |
fix errors
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 12 | ||||
| -rw-r--r-- | wpspaster.sh | 9 |
3 files changed, 13 insertions, 12 deletions
@@ -1,7 +1,7 @@ pkgbase = wpspaster pkgdesc = Free rich text editor image and text pasting.富文本图文粘贴 pkgver = 2.0.1 - pkgrel = 3 + pkgrel = 4 url = http://xoobom.com:8020/#/rich-text-editor/tinymce arch = aarch64 arch = x86_64 @@ -15,6 +15,6 @@ pkgbase = wpspaster source = wpspaster.git::git+https://github.com/xoobom/wpspaster.git#tag=v2.0.1 source = wpspaster.sh sha256sums = SKIP - sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231 + sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014 pkgname = wpspaster @@ -3,7 +3,7 @@ pkgname=wpspaster pkgver=2.0.1 _electronversion=25 _nodeversion=18 -pkgrel=3 +pkgrel=4 pkgdesc="Free rich text editor image and text pasting.富文本图文粘贴" arch=( 'aarch64' @@ -27,7 +27,7 @@ source=( "${pkgname}.sh" ) sha256sums=('SKIP' - 'd4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231') + '0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014') _ensure_local_nvm() { export NVM_DIR="${srcdir}/.nvm" source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]] @@ -37,17 +37,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 "${pkgname}" --exec "${pkgname} %U" + gendesk -q -f -n --categories="Utility" --name="${pkgname}" --exec="${pkgname} %U" cd "${srcdir}/${pkgname}.git/${pkgname}-electron-vite" 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}" - sed "s|--linux|--linux AppImage|g" -i package.json + HOME="${srcdir}/.electron-gyp" + sed "s|--linux|-l AppImage|g" -i package.json npm install npm run build:linux } diff --git a/wpspaster.sh b/wpspaster.sh index aacd8f895847..f9ced1432cfc 100644 --- a/wpspaster.sh +++ b/wpspaster.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 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 |