diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 21 | ||||
| -rw-r--r-- | httptoolkit.sh | 11 |
3 files changed, 22 insertions, 16 deletions
@@ -1,6 +1,6 @@ pkgbase = httptoolkit-git pkgdesc = A beautiful, cross-platform & open-source HTTP(S) proxy, analyzer and client. - pkgver = 1.14.11.r0.gd26dea0 + pkgver = 1.15.0.r0.g01e0ddb pkgrel = 1 url = https://httptoolkit.com/ arch = any @@ -15,11 +15,11 @@ pkgbase = httptoolkit-git depends = mercurial depends = nodejs depends = java-runtime - provides = httptoolkit=1.14.11 + provides = httptoolkit=1.15.0 conflicts = httptoolkit source = httptoolkit.git::git+https://github.com/httptoolkit/httptoolkit-desktop.git source = httptoolkit.sh sha256sums = SKIP - sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8 + sha256sums = 24c1c5b90cba47cd3d7a3ff11a934fcdbb499f8c56423d22009ef33a775e2d21 pkgname = httptoolkit-git @@ -2,7 +2,7 @@ # Contributor: Jason Nader <jason *add-dot-here* nader *you-know-what-goes-here* protonmail.com> pkgname=httptoolkit-git _pkgname="HTTP Toolkit Desktop" -pkgver=1.14.11.r0.gd26dea0 +pkgver=1.15.0.r0.g01e0ddb _electronversion=29 _nodeversion=20 pkgrel=1 @@ -31,7 +31,7 @@ source=( "${pkgname//-/.}::git+${_ghurl}.git" "${pkgname%-git}.sh") sha256sums=('SKIP' - 'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8') + '24c1c5b90cba47cd3d7a3ff11a934fcdbb499f8c56423d22009ef33a775e2d21') pkgver() { cd "${srcdir}/${pkgname//-/.}" git describe --long --tags --exclude='*[a-z][a-z]*' | sed -E 's/^v//;s/([^-]*-g)/r\1/;s/-/./g' @@ -53,17 +53,16 @@ build() { 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 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://registry.npmmirror.com/-/binary/node/ HOME="${srcdir}/.electron-gyp" if [ `curl -s ipinfo.io/country | grep CN | wc -l ` -ge 1 ];then - echo -e "\n" >> .npmrc - 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_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 diff --git a/httptoolkit.sh b/httptoolkit.sh index 7ddcaab8d734..79987c30c522 100644 --- a/httptoolkit.sh +++ b/httptoolkit.sh @@ -7,10 +7,17 @@ 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_RUN_AS_NODE=0 +export ELECTRON_DISABLE_SECURITY_WARNINGS=true export NODE_ENV=production +export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" +_FLAGS_FILE="${XDG_CONFIG_HOME}/@appname@-flags.conf" +if [ -r "${_FLAGS_FILE}" ]; then + _USER_FLAGS="$(cat "${_FLAGS_FILE}")" +fi cd "${_APPDIR}" if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then - exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "$@" || exit $? + exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "${_USER_FLAGS}" "$@" || exit $? else - exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "$@" || exit $? + exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "${_USER_FLAGS}" "$@" || exit $? fi
\ No newline at end of file |