diff options
author | zxp19821005 | 2024-07-19 16:06:02 +0800 |
---|---|---|
committer | zxp19821005 | 2024-07-19 16:06:02 +0800 |
commit | 80bdb8d387f7ee0a8c4783e2a004e2af377094b5 (patch) | |
tree | e8527899de29b4b78ee6a800705b18c374b0b840 | |
parent | 0d9e81a0e680971153e62451999a511250de57dd (diff) | |
download | aur-80bdb8d387f7ee0a8c4783e2a004e2af377094b5.tar.gz |
fix errors
-rw-r--r-- | .SRCINFO | 3 | ||||
-rw-r--r-- | PKGBUILD | 21 | ||||
-rw-r--r-- | nora.sh | 4 |
3 files changed, 15 insertions, 13 deletions
@@ -9,12 +9,13 @@ pkgbase = nora-git makedepends = git makedepends = nvm makedepends = gendesk + makedepends = curl depends = electron30 provides = nora=3.0.0.stable conflicts = nora source = nora.git::git+https://github.com/Sandakan/Nora.git source = nora.sh sha256sums = SKIP - sha256sums = 41b6d61dffef064762b3eec3dfeca7a3e1f57cbcb6dce9a6940c06797a0eae9d + sha256sums = 2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051 pkgname = nora-git @@ -20,15 +20,17 @@ makedepends=( 'git' 'nvm' 'gendesk' + 'curl' ) source=( "${pkgname//-/.}::git+${_ghurl}.git" - "${pkgname%-git}.sh") + "${pkgname%-git}.sh" +) sha256sums=('SKIP' - '41b6d61dffef064762b3eec3dfeca7a3e1f57cbcb6dce9a6940c06797a0eae9d') + '2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051') pkgver() { cd "${srcdir}/${pkgname//-/.}" - git describe --long --tags | 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" @@ -44,14 +46,14 @@ build() { -e "s|@options@|env ELECTRON_OZONE_PLATFORM_HINT=auto|g" \ -i "${srcdir}/${pkgname%-git}.sh" _ensure_local_nvm - gendesk -q -f -n --categories="AudioVideo" --name="${_pkgname}" --exec="${pkgname%-git} %U" + gendesk -q -f -n --pkgname="${pkgname%-git}" --pkgdesc="${pkgdesc}" --categories="AudioVideo" --name="${_pkgname}" --exec="${pkgname%-git} %U" cd "${srcdir}/${pkgname//-/.}" 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_registry=https://registry.npmmirror.com @@ -61,9 +63,8 @@ build() { else echo "Your network is OK." fi - sed "/- AppImage/d;/- snap/d;s|- deb|- dir|g" -i electron-builder.yml - npm install - npm run build:linux + NODE_ENV=development npm install + NODE_ENV=production npm run build:unpack } package() { install -Dm755 "${srcdir}/${pkgname%-git}.sh" "${pkgdir}/usr/bin/${pkgname%-git}" @@ -23,7 +23,7 @@ if [[ -f "${_FLAGS_FILE}" ]]; then fi cd "${_APPDIR}" if [[ "${EUID}" -ne 0 ]] || [[ "${ELECTRON_RUN_AS_NODE}" ]]; then - exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "${_USER_FLAGS[@]}" "$@" + exec electron@electronversion@ "${_RUNNAME}" ${_OPTIONS} "${_USER_FLAGS[@]}" "$@" else - exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "${_USER_FLAGS[@]}" "$@" + exec electron@electronversion@ "${_RUNNAME}" ${_OPTIONS} --no-sandbox "${_USER_FLAGS[@]}" "$@" fi
\ No newline at end of file |