diff options
| -rw-r--r-- | .SRCINFO | 9 | ||||
| -rw-r--r-- | PKGBUILD | 33 | ||||
| -rw-r--r-- | httptoolkit.sh | 11 |
3 files changed, 31 insertions, 22 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.17.2.r0.ga636092 pkgrel = 1 url = https://httptoolkit.com/ arch = any @@ -9,17 +9,18 @@ pkgbase = httptoolkit-git makedepends = git makedepends = nvm makedepends = gendesk - makedepends = base-devel makedepends = gcc + makedepends = cmake + makedepends = curl depends = electron29 depends = mercurial depends = nodejs depends = java-runtime - provides = httptoolkit=1.14.11 + provides = httptoolkit=1.17.2 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.17.2.r0.ga636092 _electronversion=29 _nodeversion=20 pkgrel=1 @@ -24,17 +24,18 @@ makedepends=( 'git' 'nvm' 'gendesk' - 'base-devel' 'gcc' + 'cmake' + 'curl' ) 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' + git describe --long --tags --abbrev=7 | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/v//g' } _ensure_local_nvm() { export NVM_DIR="${srcdir}/.nvm" @@ -46,30 +47,30 @@ 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@|env ELECTRON_OZONE_PLATFORM_HINT=auto|g" \ -i "${srcdir}/${pkgname%-git}.sh" _ensure_local_nvm - gendesk -q -f -n --categories="Development" --name="${_pkgname}" --exec="${pkgname%-git} %U" + gendesk -q -f -n --pkgname="${pkgname%-git}" --pkgdesc="${pkgdesc}" --categories="Development" --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 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 sed '/"deb",/d;/"rpm",/d;/"AppImage",/d;s|"zip"|"dir"|g' -i package.json - npm install - npm run build + NODE_ENV=development npm install + NODE_ENV=production npm run build } package() { install -Dm755 "${srcdir}/${pkgname%-git}.sh" "${pkgdir}/usr/bin/${pkgname%-git}" 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 |