diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 34 | ||||
| -rw-r--r-- | favicon-generator.sh | 21 |
3 files changed, 42 insertions, 25 deletions
@@ -1,19 +1,19 @@ pkgbase = favicon-generator pkgdesc = Small Electron based app to generate favicon in different formats. pkgver = 0.1.1 - pkgrel = 8 + pkgrel = 9 url = https://github.com/anthonypauwels/favicon-generator arch = any license = ISC - makedepends = npm + makedepends = npm>=9.0.0 makedepends = nvm makedepends = gendesk - makedepends = git - depends = electron14-bin + makedepends = curl + depends = electron14 conflicts = favicon-generator source = favicon-generator.git::git+https://github.com/anthonypauwels/favicon-generator.git#tag=0.1.1 source = favicon-generator.sh - sha256sums = SKIP - sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8 + sha256sums = 526787d598b1708c4ec50e70e20726fffd1c06dae1369eb63cb0ea8dc69ae0fc + sha256sums = 41b6d61dffef064762b3eec3dfeca7a3e1f57cbcb6dce9a6940c06797a0eae9d pkgname = favicon-generator @@ -4,27 +4,27 @@ _pkgname="Favicon Generator" pkgver=0.1.1 _electronversion=14 _nodeversion=18 -pkgrel=8 +pkgrel=9 pkgdesc="Small Electron based app to generate favicon in different formats." arch=('any') url="https://github.com/anthonypauwels/favicon-generator" license=('ISC') conflicts=("${pkgname}") depends=( - "electron${_electronversion}-bin" + "electron${_electronversion}" ) makedepends=( - 'npm' + 'npm>=9.0.0' 'nvm' 'gendesk' - 'git' + 'curl' ) source=( "${pkgname}.git::git+${url}.git#tag=${pkgver}" "${pkgname%-bin}.sh" ) -sha256sums=('SKIP' - 'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8') +sha256sums=('526787d598b1708c4ec50e70e20726fffd1c06dae1369eb63cb0ea8dc69ae0fc' + '41b6d61dffef064762b3eec3dfeca7a3e1f57cbcb6dce9a6940c06797a0eae9d') _ensure_local_nvm() { export NVM_DIR="${srcdir}/.nvm" source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]] @@ -35,24 +35,28 @@ build() { sed -e "s|@electronversion@|${_electronversion}|" \ -e "s|@appname@|${pkgname}|g" \ -e "s|@runname@|app.asar|g" \ + -e "s|@cfgdirname@|${pkgname}|g" \ -e "s|@options@||g" \ -i "${srcdir}/${pkgname}.sh" _ensure_local_nvm - gendesk -f -n -q --categories="Graphics" --name="${_pkgname}" --exec="${pkgname} %U" + gendesk -f -n -q --pkgname="${pkgname}" --categories="Graphics" --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 - export SYSTEM_ELECTRON_VERSION="$(electron${_electronversion} -v | sed 's/v//g')" - export npm_config_target="${SYSTEM_ELECTRON_VERSION}" - export ELECTRONVERSION="${_electronversion}" - export npm_config_disturl=https://electronjs.org/headers + #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 ifconfig.co/country` == "China" ];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 + if [ `curl -s ipinfo.io/country | grep CN | wc -l ` -ge 1 ];then + 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 + sed "s|AppImage|dir|g" -i package.json npm install npm run build } diff --git a/favicon-generator.sh b/favicon-generator.sh index 7ddcaab8d734..398398461fee 100644 --- a/favicon-generator.sh +++ b/favicon-generator.sh @@ -1,16 +1,29 @@ #!/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}" export ELECTRON_IS_DEV=0 export ELECTRON_FORCE_IS_PACKAGED=true +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}" +export _FLAGS_FILE="${XDG_CONFIG_HOME}/${_CFGDIR}@appname@-flags.conf" +declare -a _USER_FLAGS +if [[ -f "${_FLAGS_FILE}" ]]; then + while read -r line; do + if [[ ! "${line}" =~ ^[[:space:]]*#.* ]]; then + _USER_FLAGS+=("${line}") + fi + done < "${_FLAGS_FILE}" +fi cd "${_APPDIR}" -if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then - exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "$@" || exit $? +if [[ "${EUID}" -ne 0 ]] || [[ "${ELECTRON_RUN_AS_NODE}" ]]; then + exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "${_USER_FLAGS[@]}" "$@" else - exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "$@" || exit $? + exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "${_USER_FLAGS[@]}" "$@" fi
\ No newline at end of file |