diff options
| author | zxp19821005 | 2024-09-06 10:19:09 +0800 |
|---|---|---|
| committer | zxp19821005 | 2024-09-06 10:19:09 +0800 |
| commit | 2e2d7d583be971470a55d109a35dee55a26813d1 (patch) | |
| tree | 809027f09f861bb6f1ceb0c1046da8dd5fe39b93 | |
| parent | e0f4e80516d5b8cef4d7538f000b9c00479a4c96 (diff) | |
| download | aur-2e2d7d583be971470a55d109a35dee55a26813d1.tar.gz | |
update to 24.9.5.418.r0.gabe25e2
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 35 | ||||
| -rw-r--r-- | map-download.sh | 2 |
3 files changed, 24 insertions, 19 deletions
@@ -1,6 +1,6 @@ pkgbase = map-download-git pkgdesc = 高德地图、百度地图（包括百度自定义地图）、腾讯地图、OpenStreetMap、CartoDb、ArcGIS在线地图的下载 - pkgver = 24.7.22.541.r0.g9237eaa + pkgver = 24.9.5.418.r0.gabe25e2 pkgrel = 1 url = https://github.com/Hxy1992/MapDownload arch = any @@ -16,11 +16,11 @@ pkgbase = map-download-git depends = electron16 depends = libvips depends = nodejs - provides = map-download=24.7.22.541 + provides = map-download=24.9.5.418 conflicts = map-download source = map-download.git::git+https://github.com/Hxy1992/MapDownload.git source = map-download.sh sha256sums = SKIP - sha256sums = 2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051 + sha256sums = 291f50480f5a61bc9c68db7d44cd0412071128706baa868a9cb854f8779a1980 pkgname = map-download-git @@ -1,7 +1,7 @@ # Maintainer: zxp19821005 <zxp19821005 at 163 dot com> pkgname=map-download-git _pkgname=MapDownload -pkgver=24.7.22.541.r0.g9237eaa +pkgver=24.9.5.418.r0.gabe25e2 _electronversion=16 _nodeversion=18 pkgrel=1 @@ -31,7 +31,7 @@ source=( "${pkgname%-git}.sh" ) sha256sums=('SKIP' - '2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051') + '291f50480f5a61bc9c68db7d44cd0412071128706baa868a9cb854f8779a1980') pkgver() { cd "${srcdir}/${pkgname%-git}.git" git describe --long --tags --abbrev=7 | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/v//g' @@ -52,25 +52,30 @@ build() { _ensure_local_nvm gendesk -f -n -q --pkgname="${pkgname%-git}" --pkgdesc="${pkgdesc}" --categories="Utility" --name="${_pkgname}" --exec="${pkgname%-git} %U" cd "${srcdir}/${pkgname%-git}.git" - export npm_config_build_from_source=true 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 SYSTEM_ELECTRON_VERSION="$(electron${_electronversion} -v | sed 's/v//g')" HOME="${srcdir}/.electron-gyp" mkdir -p "${srcdir}/.electron-gyp" - touch "${srcdir}/.electron-gyp/.yarnrc" - if [ `curl -s ipinfo.io/country | grep CN | wc -l ` -ge 1 ];then - 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/ + if [[ "$(curl -s ipinfo.io/country)" == *"CN"* ]]; then + echo 'registry "https://registry.npmmirror.com"' > "${srcdir}/.electron-gyp/.yarnrc" + echo 'disturl "https://registry.npmmirror.com/-/binary/node/"' >> "${srcdir}/.electron-gyp/.yarnrc" + echo 'electron_mirror "https://registry.npmmirror.com/-/binary/electron/"' >> "${srcdir}/.electron-gyp/.yarnrc" + echo 'electron_builder_binaries_mirror "https://registry.npmmirror.com/-/binary/electron-builder-binaries/"' >> "${srcdir}/.electron-gyp/.yarnrc" + echo "cacheFolder "${srcdir}"/.yarn/cache" >> "${srcdir}/.electron-gyp/.yarnrc" + echo "pluginsFolder "${srcdir}"/.yarn/plugins" >> "${srcdir}/.electron-gyp/.yarnrc" + echo "globalFolder "${srcdir}"/.yarn/global" >> "${srcdir}/.electron-gyp/.yarnrc" + echo 'useHardlinks true' >> "${srcdir}/.electron-gyp/.yarnrc" + echo 'buildFromSource true' >> "${srcdir}/.electron-gyp/.yarnrc" + echo 'linkWorkspacePackages true' >> "${srcdir}/.electron-gyp/.yarnrc" + echo 'fetchRetries 3' >> "${srcdir}/.electron-gyp/.yarnrc" + echo 'fetchRetryTimeout 10000' >> "${srcdir}/.electron-gyp/.yarnrc" else echo "Your network is OK." fi - NODE_ENV=development yarn install --cache-folder "${srcdir}/.yarn_cache" - NODE_ENV=production yarn run precompile - NODE_ENV=production yarn run compile + sed "s|\"electron\": \"\([^\"]*\)\"|\"electron\": \"${SYSTEM_ELECTRON_VERSION}\"|g" -i package.json + NODE_ENV=development yarn install --cache-folder "${srcdir}/.yarn_cache" + NODE_ENV=production yarn run precompile + NODE_ENV=production yarn run compile } package() { install -Dm755 "${srcdir}/${pkgname%-git}.sh" "${pkgdir}/usr/bin/${pkgname%-git}" diff --git a/map-download.sh b/map-download.sh index 4cfe3ac09dd8..40e422ca2ee7 100644 --- a/map-download.sh +++ b/map-download.sh @@ -21,7 +21,7 @@ if [[ -f "${_FLAGS_FILE}" ]]; then fi done < "${_FLAGS_FILE}" fi -cd "${_APPDIR}" +cd "${_APPDIR}" || { echo "Failed to change directory to ${_APPDIR}"; exit 1; } if [[ "${EUID}" -ne 0 ]] || [[ "${ELECTRON_RUN_AS_NODE}" ]]; then exec electron@electronversion@ "${_RUNNAME}" ${_OPTIONS} "${_USER_FLAGS[@]}" "$@" else |