diff options
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 29 | ||||
-rw-r--r-- | switchhosts.sh | 21 |
3 files changed, 35 insertions, 21 deletions
@@ -1,6 +1,6 @@ pkgbase = switchhosts-git pkgdesc = An app for managing hosts file,and switch hosts quickly! - pkgver = 4.2.0.beta.r39.g6904119 + pkgver = 4.2.0.beta.r51.gdc75a00 pkgrel = 1 url = https://github.com/oldj/SwitchHosts arch = any @@ -9,12 +9,12 @@ pkgbase = switchhosts-git makedepends = git makedepends = nvm makedepends = npm - depends = electron24-bin + depends = electron24 provides = switchhosts conflicts = switchhosts source = switchhosts.git::git+https://github.com/oldj/SwitchHosts.git source = switchhosts.sh sha256sums = SKIP - sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8 + sha256sums = 2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051 pkgname = switchhosts-git @@ -1,6 +1,7 @@ # Maintainer: zxp19821005 <zxp19821005 at 163 dot com> pkgname=switchhosts-git -pkgver=4.2.0.beta.r39.g6904119 +_pkgname=SwitchHosts +pkgver=4.2.0.beta.r51.gdc75a00 _electronversion=24 _nodeversion=18 pkgrel=1 @@ -11,7 +12,7 @@ license=('Apache-2.0') conflicts=("${pkgname%-git}") provides=("${pkgname%-git}") depends=( - "electron${_electronversion}-bin" + "electron${_electronversion}" ) makedepends=( 'gendesk' @@ -24,11 +25,10 @@ source=( "${pkgname%-git}.sh" ) sha256sums=('SKIP' - 'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8') + '2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051') pkgver() { cd "${srcdir}/${pkgname//-/.}" - #git describe --long --tags --exclude='*[a-z][a-z]*' | sed -E 's/^v//;s/([^-]*-g)/r\1/;s/-/./g' - git describe --tags | sed 's/\w\+\///g;s/\([^-]*-g\)/r\1/;s/-/./g;s/v//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" @@ -40,27 +40,28 @@ build() { sed -e "s|@electronversion@|${_electronversion}|" \ -e "s|@appname@|${pkgname%-git}|g" \ -e "s|@runname@|app.asar|g" \ + -e "s|@cfgdirname@|${_pkgname}|g" \ -e "s|@options@||g" \ -i "${srcdir}/${pkgname%-git}.sh" _ensure_local_nvm - gendesk -q -f -n --categories "Utility" --pkgname="${pkgname%-git}" --name="SwitchHosts" --exec="${pkgname%-git} %U" + gendesk -q -f -n --pkgdesc="${pkgdesc}" --categories="Utility" --pkgname="${pkgname%-git}" --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 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 -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 + 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 '/deb:/d;s|app.icns|app.png|g;/npm.taobao.org/d;/AppImage:arm64/d;/AppImage:armv7l/d;s|AppImage:x64|AppImage|g' -i scripts/make.js + sed '/deb:/d;s|app.icns|app.png|g;/npm.taobao.org/d;/AppImage:arm64/d;/AppImage:armv7l/d;s|AppImage:x64|dir|g' -i scripts/make.js npm install npm run build npm run make:linux diff --git a/switchhosts.sh b/switchhosts.sh index 7ddcaab8d734..4cfe3ac09dd8 100644 --- a/switchhosts.sh +++ b/switchhosts.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 |