diff options
author | zxp19821005 | 2024-03-22 10:05:08 +0800 |
---|---|---|
committer | zxp19821005 | 2024-03-22 10:05:08 +0800 |
commit | b80874f3db5b9109b84659a316c49991b3bf226a (patch) | |
tree | 9b99b7b65664ba05a6988ed786de3c0b554a1ab1 | |
parent | 526c7cab0d52ede5afd9b5f5da7b23fcdb63a843 (diff) | |
download | aur-b80874f3db5b9109b84659a316c49991b3bf226a.tar.gz |
fix errors
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | PKGBUILD | 20 | ||||
-rw-r--r-- | pad-md.sh | 5 |
3 files changed, 22 insertions, 15 deletions
@@ -1,21 +1,21 @@ pkgbase = pad-md pkgdesc = A notepad app for desktop, developed in Electron, with TS/JS, HTML and CSS. pkgver = 0.6 - pkgrel = 4 + pkgrel = 5 url = https://pad-md-landing-page.vercel.app/ arch = any license = AGPL-3.0-only makedepends = gendesk makedepends = npm - makedepends = dpkg - makedepends = fakeroot makedepends = git - depends = electron24 + makedepends = curl + depends = electron24-bin depends = nodejs conflicts = pad-md + options = !emptydirs source = pad-md.git::git+https://github.com/Coffee-for-Cats/pad-md.git#tag=stable6 source = pad-md.sh - sha256sums = SKIP - sha256sums = 50b10386d13e5bec806aeb78f819c4edd0208a4d184332e53866c802731217fe + sha256sums = 5a87f23955482ae586a49f3713f8b7de64733bdb2fbf3ddb28158f876fffcf96 + sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8 pkgname = pad-md @@ -2,7 +2,7 @@ pkgname=pad-md pkgver=0.6 _electronversion=24 -pkgrel=4 +pkgrel=5 pkgdesc="A notepad app for desktop, developed in Electron, with TS/JS, HTML and CSS." arch=('any') url="https://pad-md-landing-page.vercel.app/" @@ -10,26 +10,30 @@ _githuburl="https://github.com/Coffee-for-Cats/pad-md" license=('AGPL-3.0-only') conflicts=("${pkgname}") depends=( - "electron${_electronversion}" + "electron${_electronversion}-bin" 'nodejs' ) makedepends=( 'gendesk' 'npm' - 'dpkg' - 'fakeroot' 'git' + 'curl' +) +options=( + #'!strip' + '!emptydirs' ) source=( "${pkgname}.git::git+${_githuburl}.git#tag=stable${pkgver//0./}" "${pkgname}.sh" ) -sha256sums=('SKIP' - '50b10386d13e5bec806aeb78f819c4edd0208a4d184332e53866c802731217fe') +sha256sums=('5a87f23955482ae586a49f3713f8b7de64733bdb2fbf3ddb28158f876fffcf96' + 'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8') build() { sed -e "s|@electronversion@|${_electronversion}|" \ -e "s|@appname@|${pkgname}|g" \ -e "s|@runname@|app|g" \ + -e "s|@options@||g" \ -i "${srcdir}/${pkgname}.sh" gendesk -f -n -q --categories="Utility" --name="${pkgname}" --exec="${pkgname}" cd "${srcdir}/${pkgname}.git" @@ -41,10 +45,12 @@ build() { export ELECTRONVERSION="${_electronversion}" export npm_config_disturl=https://electronjs.org/headers HOME="${srcdir}/.electron-gyp" - if [ `curl ifconfig.co/country` == "China" ];then + if [ `curl -s ipinfo.io/country | grep CN | wc -l ` -ge 1 ];then echo 'registry="https://registry.npmmirror.com/"' >> .npmrc echo 'electron_mirror="https://registry.npmmirror.com/-/binary/electron/"' >> .npmrc echo 'electron_builder_binaries_mirror="https://registry.npmmirror.com/-/binary/electron-builder-binaries/"' >> .npmrc + else + echo "Your network is OK." fi npm install npm run build diff --git a/pad-md.sh b/pad-md.sh index 86cb3dc6a9bf..7ddcaab8d734 100644 --- a/pad-md.sh +++ b/pad-md.sh @@ -2,6 +2,7 @@ set -e _APPDIR="/usr/lib/@appname@" _RUNNAME="${_APPDIR}/@runname@" +_OPTIONS="@options@" export PATH="${_APPDIR}:${PATH}" export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}" export ELECTRON_IS_DEV=0 @@ -9,7 +10,7 @@ export ELECTRON_FORCE_IS_PACKAGED=true export NODE_ENV=production cd "${_APPDIR}" if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then - exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $? + exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "$@" || exit $? else - exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $? + exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "$@" || exit $? fi
\ No newline at end of file |