diff options
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 19 | ||||
-rw-r--r-- | webtorrent-desktop.sh | 5 |
3 files changed, 18 insertions, 12 deletions
@@ -4,18 +4,18 @@ pkgbase = webtorrent-desktop-git pkgrel = 1 url = https://webtorrent.io/desktop arch = aarch64 - arch = armv7h arch = x86_64 license = MIT makedepends = git makedepends = nvm makedepends = npm - depends = electron15 + makedepends = curl + depends = electron15-bin provides = webtorrent-desktop conflicts = webtorrent-desktop source = webtorrent-desktop.git::git+https://github.com/webtorrent/webtorrent-desktop.git source = webtorrent-desktop.sh sha256sums = SKIP - sha256sums = 50b10386d13e5bec806aeb78f819c4edd0208a4d184332e53866c802731217fe + sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8 pkgname = webtorrent-desktop-git @@ -9,7 +9,6 @@ pkgrel=1 pkgdesc="Streaming torrent client." arch=( 'aarch64' - 'armv7h' 'x86_64' ) url="https://webtorrent.io/desktop" @@ -18,19 +17,20 @@ license=('MIT') conflicts=("${pkgname%-git}") provides=("${pkgname%-git}") depends=( - "electron${_electronversion}" + "electron${_electronversion}-bin" ) makedepends=( 'git' 'nvm' 'npm' + 'curl' ) source=( "${pkgname%-git}.git::git+${_ghurl}.git" "${pkgname%-git}.sh" ) sha256sums=('SKIP' - '50b10386d13e5bec806aeb78f819c4edd0208a4d184332e53866c802731217fe') + 'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8') pkgver() { cd "${srcdir}/${pkgname%-git}.git" git describe --long --tags --exclude='*[a-z][a-z]*' | sed -E 's/^v//;s/([^-]*-g)/r\1/;s/-/./g' @@ -45,6 +45,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 cd "${srcdir}/${pkgname%-git}.git" @@ -56,8 +57,15 @@ build() { export ELECTRONVERSION="${_electronversion}" export npm_config_disturl=https://electronjs.org/headers 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 + else + echo "Your network is OK." + fi npm install - npm run package -- linux --package=deb + npm run package -- linux --package=zip sed -e "s|Exec=\/opt\/${pkgname%-git}\/${_pkgname}|Exec=${pkgname%-git}|g" \ -e "s|Path=\/opt\/${pkgname%-git}|Path=\/usr\/lib\/${pkgname%-git}|g" \ -i static/linux/share/applications/"${pkgname%-git}.desktop" @@ -68,9 +76,6 @@ package() { aarch64) _osarchdir="${_pkgname}-linux-arm64" ;; - armv7h) - _osarchdir="${_pkgname}-linux-armv7l" - ;; x86_64) _osarchdir="${_pkgname}-linux-x64" ;; diff --git a/webtorrent-desktop.sh b/webtorrent-desktop.sh index 86cb3dc6a9bf..7ddcaab8d734 100644 --- a/webtorrent-desktop.sh +++ b/webtorrent-desktop.sh @@ -2,6 +2,7 @@ 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 @@ -9,7 +10,7 @@ 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 |