diff options
-rw-r--r-- | .SRCINFO | 2 | ||||
-rw-r--r-- | PKGBUILD | 19 | ||||
-rw-r--r-- | motrix.sh | 8 |
3 files changed, 20 insertions, 9 deletions
@@ -19,6 +19,6 @@ pkgbase = motrix-git source = motrix.git::git+https://github.com/agalwood/Motrix.git source = motrix.sh sha256sums = SKIP - sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014 + sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8 pkgname = motrix-git @@ -4,7 +4,7 @@ pkgname=motrix-git _pkgname=Motrix pkgver=1.8.19.r30.g7012040 _electronversion=22 -_nodeversion=16 +_nodeversion=18 pkgrel=1 pkgdesc="A full-featured download manager that supports downloading HTTP, FTP, BitTorrent, Magnet, etc." arch=( @@ -34,7 +34,7 @@ source=( "${pkgname%-git}.sh" ) sha256sums=('SKIP' - '0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014') + 'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8') pkgver() { cd "${srcdir}/${pkgname//-/.}" git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' @@ -49,6 +49,7 @@ build() { sed -e "s|@electronversion@|${_electronversion}|" \ -e "s|@appname@|${pkgname%-git}|g" \ -e "s|@runname@|app.asar|g" \ + -e "s|@options@||g" \ -i "${srcdir}/${pkgname%-git}.sh" _ensure_local_nvm gendesk -q -f -n --categories="Network" --name="${_pkgname}" --exec="${pkgname%-git} %U" @@ -58,11 +59,19 @@ build() { 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 HOME="${srcdir}/.electron-gyp" - sed '161,180d' -i electron-builder.json + mkdir -p "${srcdir}/.electron-gyp" + touch "${srcdir}/.electron-gyp/.yarnrc" + 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 + else + echo "Your network is OK." + fi yarn install --cache-folder "${srcdir}/.yarn_cache" - yarn lint:fix - yarn run build + yarn run build:dir } package() { install -Dm755 "${srcdir}/${pkgname%-git}.sh" "${pkgdir}/usr/bin/${pkgname%-git}" diff --git a/motrix.sh b/motrix.sh index f9ced1432cfc..7ddcaab8d734 100644 --- a/motrix.sh +++ b/motrix.sh @@ -1,14 +1,16 @@ -#!/bin/sh +#!/bin/bash set -e _APPDIR="/usr/lib/@appname@" _RUNNAME="${_APPDIR}/@runname@" +_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 NODE_ENV=production cd "${_APPDIR}" if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then - exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $? + exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "$@" || exit $? else - exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $? + exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "$@" || exit $? fi
\ No newline at end of file |