diff options
| author | zxp19821005 | 2024-09-27 16:43:37 +0800 |
|---|---|---|
| committer | zxp19821005 | 2024-09-27 16:43:37 +0800 |
| commit | 765e264fe352159df714946a8f6a0f9351518717 (patch) | |
| tree | 97366e55015f67c9a3fda4ef416c293b5bfa7a24 | |
| parent | 3f813f63d891a16f30850672091feb79625b09ea (diff) | |
| download | aur-765e264fe352159df714946a8f6a0f9351518717.tar.gz | |
fix errors
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 53 | ||||
| -rw-r--r-- | miuzcpc.sh | 2 |
3 files changed, 30 insertions, 27 deletions
@@ -19,6 +19,6 @@ pkgbase = miuzcpc-git source = miuzcpc.git::git+https://github.com/miboqiang130/miuzcPC.git source = miuzcpc.sh sha256sums = SKIP - sha256sums = 2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051 + sha256sums = 291f50480f5a61bc9c68db7d44cd0412071128706baa868a9cb854f8779a1980 pkgname = miuzcpc-git @@ -29,46 +29,49 @@ source=( "${pkgname%-git}.sh" ) sha256sums=('SKIP' - '2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051') + '291f50480f5a61bc9c68db7d44cd0412071128706baa868a9cb854f8779a1980') pkgver() { cd "${srcdir}/${pkgname//-/.}" - git describe --long --tags --abbrev=7 | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/v//g' + set -o pipefail + git describe --long --tags --abbrev=7 | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/v//g' || + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short=7 HEAD)" } _ensure_local_nvm() { - export NVM_DIR="${srcdir}/.nvm" + local NVM_DIR="${srcdir}/.nvm" source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]] nvm install "${_nodeversion}" nvm use "${_nodeversion}" } build() { - sed -e "s|@electronversion@|${_electronversion}|" \ - -e "s|@appname@|${pkgname%-git}|g" \ - -e "s|@runname@|app.asar|g" \ - -e "s|@cfgdirname@|${pkgname%-git}|g" \ - -e "s|@options@||g" \ - -i "${srcdir}/${pkgname%-git}.sh" + sed -e " + s/@electronversion@/${_electronversion}/g + s/@appname@/${pkgname%-git}/g + s/@runname@/app.asar/g + s/@cfgdirname@/${pkgname%-git}/g + s/@options@/env ELECTRON_OZONE_PLATFORM_HINT=auto/g + " -i "${srcdir}/${pkgname%-git}.sh" _ensure_local_nvm gendesk -q -f -n --pkgname="${pkgname%-git}" --pkgdesc="${pkgdesc}" --categories="AudioVideo" --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 SYSTEM_ELECTRON_VERSION="$(electron${_electronversion} -v | sed 's/v//g')" HOME="${srcdir}/.electron-gyp" - 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/ - else - echo "Your network is OK." - fi + { + echo -e '\n' + #echo 'build_from_source=true' + echo "cache=${srcdir}/.npm_cache" + if [[ "$(curl -s ipinfo.io/country)" == *"CN"* ]]; then + echo 'registry=https://registry.npmmirror.com' + echo 'disturl=https://registry.npmmirror.com/-/binary/node/' + echo 'electron_mirror=https://registry.npmmirror.com/-/binary/electron/' + echo 'electron_builder_binaries_mirror=https://registry.npmmirror.com/-/binary/electron-builder-binaries/' + fi + } >> .npmrc icotool -x src/renderer/assets/icon/icon.ico -o src/renderer/assets/icon/icon.png - sed "s|icon\.ico|icon\.png|g" -i src/main.js - NODE_ENV=development npm install - NODE_ENV=production npm run package + find src -type f -exec sed -i "s/icon\.ico/icon\.png/g" src/main.js {} \; + sed -i "s/\"electron\": \"[^\"]*\"/\"electron\": \"${SYSTEM_ELECTRON_VERSION}\"/g" package.json + NODE_ENV=development npm install + NODE_ENV=production npm run package } package() { install -Dm755 "${srcdir}/${pkgname%-git}.sh" "${pkgdir}/usr/bin/${pkgname%-git}" diff --git a/miuzcpc.sh b/miuzcpc.sh index 4cfe3ac09dd8..40e422ca2ee7 100644 --- a/miuzcpc.sh +++ b/miuzcpc.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 |