diff options
| author | zxp19821005 | 2024-01-19 16:14:00 +0800 |
|---|---|---|
| committer | zxp19821005 | 2024-01-19 16:14:00 +0800 |
| commit | b601bfa08d5c46cde92df8bca85e8c6422296d0d (patch) | |
| tree | 2050478ae2cab03ceb492bdf9bcf84098d38b43e | |
| parent | f0589ae56937e89765c0ccb4386ced4757d2c8be (diff) | |
| download | aur-b601bfa08d5c46cde92df8bca85e8c6422296d0d.tar.gz | |
fix errors
| -rw-r--r-- | .SRCINFO | 7 | ||||
| -rw-r--r-- | PKGBUILD | 17 | ||||
| -rw-r--r-- | wai-chat-desktop.sh | 13 |
3 files changed, 20 insertions, 17 deletions
@@ -1,7 +1,7 @@ pkgbase = wai-chat-desktop pkgdesc = An electron project for chatgpt wai chat bot pkgver = 1.1.2 - pkgrel = 4 + pkgrel = 5 url = https://github.com/ptp-build/wai-chat-desktop arch = any license = custom @@ -11,10 +11,11 @@ pkgbase = wai-chat-desktop makedepends = git depends = electron24 depends = hicolor-icon-theme + depends = nodejs conflicts = wai-chat-desktop - source = wai-chat-desktop-1.1.2::git+https://github.com/ptp-build/wai-chat-desktop.git#tag=v1.1.2 + source = wai-chat-desktop.git::git+https://github.com/ptp-build/wai-chat-desktop.git#tag=v1.1.2 source = wai-chat-desktop.sh sha256sums = SKIP - sha256sums = 8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84 + sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231 pkgname = wai-chat-desktop @@ -4,7 +4,7 @@ _pkgname="Wai Chat" pkgver=1.1.2 _electronversion=24 _nodeversion=14 -pkgrel=4 +pkgrel=5 pkgdesc="An electron project for chatgpt wai chat bot" arch=('any') url="https://github.com/ptp-build/wai-chat-desktop" @@ -13,6 +13,7 @@ conflicts=("${pkgname}") depends=( "electron${_electronversion}" 'hicolor-icon-theme' + 'nodejs' ) makedepends=( 'npm' @@ -21,11 +22,11 @@ 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') _ensure_local_nvm() { export NVM_DIR="${srcdir}/.nvm" source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]] @@ -38,8 +39,8 @@ build() { -e "s|@appasar@|app|g" \ -i "${srcdir}/${pkgname}.sh" _ensure_local_nvm - gendesk -q -f -n --categories "Utility" --name "${_pkgname}" --exec "${pkgname}" - cd "${srcdir}/${pkgname}-${pkgver}" + 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 @@ -52,11 +53,11 @@ build() { package() { install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname}" install -Dm755 -d "${pkgdir}/usr/lib/${pkgname}" - cp -r "${srcdir}/${pkgname}-${pkgver}/out/${_pkgname}-linux-x64/resources/app" "${pkgdir}/usr/lib/${pkgname}" + cp -r "${srcdir}/${pkgname}.git/out/${_pkgname}-linux-"*/resources/app "${pkgdir}/usr/lib/${pkgname}" for _icons in 256x256 512x512;do - install -Dm644 "${srcdir}/${pkgname}-${pkgver}/src/icons/favicon.${_icons}.png" \ + install -Dm644 "${srcdir}/${pkgname}.git/src/icons/favicon.${_icons}.png" \ "${pkgdir}/usr/share/icons/hicolor/${_icons}/apps/${pkgname}.png" done - install -Dm644 "${srcdir}/${pkgname}-${pkgver}/out/${_pkgname}-linux-x64/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}" + install -Dm644 "${srcdir}/${pkgname}.git/out/${_pkgname}-linux-"*/LICENSE* -t "${pkgdir}/usr/share/licenses/${pkgname}" install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications" }
\ No newline at end of file diff --git a/wai-chat-desktop.sh b/wai-chat-desktop.sh index 2ec4412e5c4f..aacd8f895847 100644 --- a/wai-chat-desktop.sh +++ b/wai-chat-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 |