diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 18 | ||||
| -rw-r--r-- | ai-browser.sh | 22 |
3 files changed, 23 insertions, 23 deletions
@@ -1,6 +1,6 @@ pkgbase = ai-browser-git pkgdesc = Client app for ChatGPT, Gemini and Claude with Monaco Editor integration. - pkgver = 1.0.7.r0.g3ee0a86 + pkgver = 1.0.8.r0.g1800e7d pkgrel = 1 url = https://github.com/Jun-Murakami/AI-Browser arch = any @@ -10,11 +10,11 @@ pkgbase = ai-browser-git makedepends = nvm makedepends = gendesk depends = electron28 - provides = ai-browser=1.0.7 + provides = ai-browser=1.0.8 conflicts = ai-browser source = ai-browser.git::git+https://github.com/Jun-Murakami/AI-Browser.git source = ai-browser.sh sha256sums = SKIP - sha256sums = 05762c556c85a4423b28600ccbbe7b7dcdd3d1be526ef4a588a510671fa6c62a + sha256sums = 41b6d61dffef064762b3eec3dfeca7a3e1f57cbcb6dce9a6940c06797a0eae9d pkgname = ai-browser-git @@ -1,7 +1,7 @@ # Maintainer: zxp19821005 <zxp19821005 at 163 dot com> pkgname=ai-browser-git _pkgname=AI-Browser -pkgver=1.0.7.r0.g3ee0a86 +pkgver=1.0.8.r0.g1800e7d _electronversion=28 _nodeversion=18 pkgrel=1 @@ -24,10 +24,10 @@ source=( "${pkgname%-git}.git::git+${url}.git" "${pkgname%-git}.sh") sha256sums=('SKIP' - '05762c556c85a4423b28600ccbbe7b7dcdd3d1be526ef4a588a510671fa6c62a') + '41b6d61dffef064762b3eec3dfeca7a3e1f57cbcb6dce9a6940c06797a0eae9d') pkgver() { cd "${srcdir}/${pkgname%-git}.git" - git describe --long --tags --exclude='*[a-z][a-z]*' | sed -E 's/^v//;s/([^-]*-g)/r\1/;s/-/./g' + git describe --long --tags --abbrev=7 | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/v//g' } _ensure_local_nvm() { export NVM_DIR="${srcdir}/.nvm" @@ -39,27 +39,27 @@ build() { sed -e "s|@electronversion@|${_electronversion}|" \ -e "s|@appname@|${pkgname%-git}|g" \ -e "s|@runname@|app.asar|g" \ + -e "s|@cfgdirname@|${pkgname%-git}|g" \ -e "s|@options@|env ELECTRON_OZONE_PLATFORM_HINT=auto|g" \ -i "${srcdir}/${pkgname%-git}.sh" _ensure_local_nvm - gendesk -q -f -n --categories="Utility" --name="${_pkgname}" --exec="${pkgname%-git} %U" + gendesk -q -f -n --pkgname="${pkgname%-git}" --categories="Utility" --name="${_pkgname}" --exec="${pkgname%-git} %U" cd "${srcdir}/${pkgname%-git}.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 SYSTEM_ELECTRON_VERSION="$(electron${_electronversion} -v | sed 's/v//g')" + #export npm_config_target="${SYSTEM_ELECTRON_VERSION}" + #export ELECTRONVERSION="${_electronversion}" HOME="${srcdir}/.electron-gyp" if [ `curl -s ipinfo.io/country | grep CN | wc -l ` -ge 1 ];then - export npm_config_disturl=https://registry.npmmirror.com/-/binary/node/ export npm_config_registry=https://registry.npmmirror.com + export npm_config_disturl=https://registry.npmmirror.com/-/binary/node/ export npm_config_electron_mirror=https://registry.npmmirror.com/-/binary/electron/ export npm_config_electron_builder_binaries_mirror=https://registry.npmmirror.com/-/binary/electron-builder-binaries/ else echo "Your network is OK." fi - rm -rf dist node_modules npm install npm run build:unpack } diff --git a/ai-browser.sh b/ai-browser.sh index 5594e5380ba2..398398461fee 100644 --- a/ai-browser.sh +++ b/ai-browser.sh @@ -1,7 +1,8 @@ #!/bin/bash -set -e +set -o pipefail _APPDIR="/usr/lib/@appname@" _RUNNAME="${_APPDIR}/@runname@" +_CFGDIR="@cfgdirname@/" _OPTIONS="@options@" export PATH="${_APPDIR}:${PATH}" export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}" @@ -11,19 +12,18 @@ export ELECTRON_DISABLE_SECURITY_WARNINGS=true export ELECTRON_OVERRIDE_DIST_PATH="/usr/bin/electron@electronversion@" export NODE_ENV=production export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" -_FLAGS_FILE="${XDG_CONFIG_HOME}/@appname@-flags.conf" -declare -a flags +export _FLAGS_FILE="${XDG_CONFIG_HOME}/${_CFGDIR}@appname@-flags.conf" +declare -a _USER_FLAGS if [[ -f "${_FLAGS_FILE}" ]]; then - mapfile -t < "${_FLAGS_FILE}" + while read -r line; do + if [[ ! "${line}" =~ ^[[:space:]]*#.* ]]; then + _USER_FLAGS+=("${line}") + fi + done < "${_FLAGS_FILE}" fi -for line in "${MAPFILE[@]}"; do - if [[ ! "${line}" =~ ^[[:space:]]*#.* ]] && [[ -n "${line}" ]]; then - flags+=("${line}") - fi -done cd "${_APPDIR}" if [[ "${EUID}" -ne 0 ]] || [[ "${ELECTRON_RUN_AS_NODE}" ]]; then - exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "${_USER_FLAGS}" "$@" || exit $? + exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "${_USER_FLAGS[@]}" "$@" else - exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "${_USER_FLAGS}" "$@" || exit $? + exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "${_USER_FLAGS[@]}" "$@" fi
\ No newline at end of file |