diff options
author | zxp19821005 | 2024-01-15 17:19:37 +0800 |
---|---|---|
committer | zxp19821005 | 2024-01-15 17:19:37 +0800 |
commit | 3c3386975c726e5ae0abaf95d6c8e754f5a735f4 (patch) | |
tree | d850b1833d1fbb368fc881cfde91c94be0fc3d55 | |
parent | 1090ea21683a01729d8d34c8e0dfccff850f39c3 (diff) | |
download | aur-3c3386975c726e5ae0abaf95d6c8e754f5a735f4.tar.gz |
fix errors
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 25 | ||||
-rw-r--r-- | loopy-desktop.sh | 13 |
3 files changed, 24 insertions, 20 deletions
@@ -1,7 +1,7 @@ pkgbase = loopy-desktop pkgdesc = A tool for thinking in systems pkgver = 1.2.1 - pkgrel = 3 + pkgrel = 4 url = https://github.com/jchu634/loopy-desktop arch = any license = MIT @@ -12,9 +12,9 @@ pkgbase = loopy-desktop makedepends = git depends = electron21 conflicts = loopy-desktop - source = loopy-desktop-1.2.1::git+https://github.com/jchu634/loopy-desktop.git#tag=v1.2.1 + source = loopy-desktop.git::git+https://github.com/jchu634/loopy-desktop.git#tag=v1.2.1 source = loopy-desktop.sh sha256sums = SKIP - sha256sums = 8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84 + sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231 pkgname = loopy-desktop @@ -2,7 +2,7 @@ pkgname=loopy-desktop pkgver=1.2.1 _electronversion=21 -pkgrel=3 +pkgrel=4 pkgdesc="A tool for thinking in systems" arch=('any') url="https://github.com/jchu634/loopy-desktop" @@ -19,26 +19,29 @@ makedepends=( 'git' ) source=( - "${pkgname}-${pkgver}::git+${url}.git#tag=v${pkgver}" + "${pkgname}.git::git+${url}.git#tag=v${pkgver}" "${pkgname}.sh" ) sha256sums=('SKIP' - '8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84') + 'd4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231') build() { sed -e "s|@electronversion@|${_electronversion}|" \ -e "s|@appname@|${pkgname}|g" \ -e "s|@appasar@|app.asar|g" \ -i "${srcdir}/${pkgname}.sh" - gendesk -f -n -q --categories "Utility" --name "${pkgname}" --exec "${pkgname}" - cd "${srcdir}/${pkgname}-${pkgver}" - yarn config set cache-folder "${srcdir}/.yarn_cache" - yarn install - yarn dist + gendesk -f -n -q --categories "Utility" --name "${pkgname}" --exec "${pkgname} %U" + cd "${srcdir}/${pkgname}.git" + export npm_config_build_from_source=true + 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 } package() { install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}" - install -Dm644 "${srcdir}/${pkgname}-${pkgver}/release/linux-unpacked/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname}" - install -Dm644 "${srcdir}/${pkgname}-${pkgver}/resources/_icons/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png" + install -Dm644 "${srcdir}/${pkgname}.git/release/linux-"*/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname}" + install -Dm644 "${srcdir}/${pkgname}.git/resources/_icons/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png" install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications" - install -Dm644 "${srcdir}/${pkgname}-${pkgver}/LICENSE.txt" -t "${pkgdir}/usr/share/licenses/${pkgname}" + install -Dm644 "${srcdir}/${pkgname}.git/LICENSE.txt" -t "${pkgdir}/usr/share/licenses/${pkgname}" }
\ No newline at end of file diff --git a/loopy-desktop.sh b/loopy-desktop.sh index 2ec4412e5c4f..aacd8f895847 100644 --- a/loopy-desktop.sh +++ b/loopy-desktop.sh @@ -1,14 +1,15 @@ -#!/bin/bash +#!/bin/sh set -e _APPDIR="/usr/lib/@appname@" +_ASAR="${_APPDIR}/@appasar@" export PATH="${_APPDIR}:${PATH}" -export ELECTRON_IS_DEV=0 export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}" -_ASAR="${_APPDIR}/@appasar@" +export ELECTRON_IS_DEV=0 +export NODE_ENV=production +cd "${_APPDIR}" 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 +fi +exit
\ No newline at end of file |