diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 41 | ||||
| -rw-r--r-- | frontimer.sh | 21 |
3 files changed, 44 insertions, 30 deletions
@@ -1,7 +1,7 @@ pkgbase = frontimer pkgdesc = Desktop timer application always displayed in the forefront of the screen pkgver = 0.1.17 - pkgrel = 5 + pkgrel = 6 url = https://github.com/seita1996/frontimer arch = any license = MIT @@ -9,12 +9,12 @@ pkgbase = frontimer makedepends = nvm makedepends = npm makedepends = yarn - makedepends = git - depends = electron25-bin + makedepends = curl + depends = electron25 conflicts = frontimer - source = frontimer.git::git+https://github.com/seita1996/frontimer.git#tag=v0.1.17 + source = frontimer-0.1.17.tar.gz::https://github.com/seita1996/frontimer/archive/refs/tags/v0.1.17.tar.gz source = frontimer.sh - sha256sums = SKIP - sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8 + sha256sums = e771af922b356b6667638646ef216ef90d5501232e2cc73326385b871fc51d39 + sha256sums = 2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051 pkgname = frontimer @@ -3,28 +3,28 @@ pkgname=frontimer pkgver=0.1.17 _electronversion=25 _nodeversion=20 -pkgrel=5 +pkgrel=6 pkgdesc="Desktop timer application always displayed in the forefront of the screen" arch=('any') url="https://github.com/seita1996/frontimer" license=('MIT') conflicts=("${pkgname}") depends=( - "electron${_electronversion}-bin" + "electron${_electronversion}" ) makedepends=( 'gendesk' 'nvm' 'npm' 'yarn' - 'git' + 'curl' ) source=( - "${pkgname}.git::git+${url}.git#tag=v${pkgver}" + "${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz" "${pkgname%-bin}.sh" ) -sha256sums=('SKIP' - 'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8') +sha256sums=('e771af922b356b6667638646ef216ef90d5501232e2cc73326385b871fc51d39' + '2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051') _ensure_local_nvm() { export NVM_DIR="${srcdir}/.nvm" source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]] @@ -35,35 +35,36 @@ build() { sed -e "s|@electronversion@|${_electronversion}|" \ -e "s|@appname@|${pkgname}|g" \ -e "s|@runname@|app.asar|g" \ + -e "s|@cfgdirname@|${pkgname}|g" \ -i "${srcdir}/${pkgname}.sh" _ensure_local_nvm - gendesk -f -n -q --categories="Utility" --name="${pkgname}" --exec="${pkgname} %U" - cd "${srcdir}/${pkgname}.git" + gendesk -f -n -q --pkgname="${pkgname}" --categories="Utility" --name="${pkgname}" --exec="${pkgname} %U" + cd "${srcdir}/${pkgname}-${pkgver}" export npm_config_build_from_source=true 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" mkdir -p "${srcdir}/.electron-gyp" touch "${srcdir}/.electron-gyp/.yarnrc" - 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|--linux AppImage|--dir|g" -i package.json + sed "s|--linux AppImage|-l --dir|g" -i package.json yarn install --cache-folder "${srcdir}/.yarn_cache" yarn run build yarn run ebuilder:linux } package() { install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}" - install -Dm644 "${srcdir}/${pkgname}.git/dist/linux-"*/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname%-bin}" - install -Dm644 "${srcdir}/${pkgname}.git/src/assets/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png" + install -Dm644 "${srcdir}/${pkgname}-${pkgver}/dist/linux-"*/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname%-bin}" + install -Dm644 "${srcdir}/${pkgname}-${pkgver}/src/assets/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png" install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications" - install -Dm644 "${srcdir}/${pkgname}.git/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}" + install -Dm644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}" }
\ No newline at end of file diff --git a/frontimer.sh b/frontimer.sh index 7ddcaab8d734..4cfe3ac09dd8 100644 --- a/frontimer.sh +++ b/frontimer.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 |