From 36b430df45bf9c33685c61085cb0e9819afe5943 Mon Sep 17 00:00:00 2001
From: zxp19821005 <zxp19821005@163.com>
Date: Mon, 2 Sep 2024 12:13:27 +0800
Subject: [PATCH] update to 1.3.0.r0.g62fb2fd

---
 .SRCINFO       |  6 +++---
 PKGBUILD       | 18 +++++++++---------
 miru-viewer.sh |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 27a86f022a06..6ace99abcc5a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = miru-viewer-git
 	pkgdesc = GitHub Issue/Pull Request/Release viewer
-	pkgver = 1.2.0.r0.gd1e46aa
+	pkgver = 1.3.0.r0.g62fb2fd
 	pkgrel = 1
 	url = https://github.com/ytakahashi/miru
 	arch = any
@@ -14,11 +14,11 @@ pkgbase = miru-viewer-git
 	makedepends = gcc
 	makedepends = curl
 	depends = electron31
-	provides = miru-viewer=1.2.0
+	provides = miru-viewer=1.3.0
 	conflicts = miru-viewer
 	source = miru-viewer.git::git+https://github.com/ytakahashi/miru.git
 	source = miru-viewer.sh
 	sha256sums = SKIP
-	sha256sums = 2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051
+	sha256sums = 291f50480f5a61bc9c68db7d44cd0412071128706baa868a9cb854f8779a1980
 
 pkgname = miru-viewer-git
diff --git a/PKGBUILD b/PKGBUILD
index 8f1d9c83c0e5..3f284e387487 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 _pkgname=miru
 pkgname="${_pkgname}-viewer-git"
-pkgver=1.2.0.r0.gd1e46aa
+pkgver=1.3.0.r0.g62fb2fd
 _electronversion=31
 _nodeversion=18
 pkgrel=1
@@ -29,7 +29,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,13 +52,12 @@ build() {
     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')"
+    export ELECTRONVERSION="${_electronversion}"
     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
+    if [[ "$(curl -s ipinfo.io/country)" == *"CN"* ]]; 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/
@@ -67,10 +66,11 @@ build() {
         echo "Your network is OK."
     fi
     yarn run rm-dist
-    sed 's|electron-builder.js",|electron-builder.js -l --dir",|g' -i package.json
+    sed "s|electron-builder --config|electron-builder -l dir --config|g;/\"electron\": /d;30i\    \"electron\": \"${SYSTEM_ELECTRON_VERSION}\"," \
+        -i package.json
     sed "s|\/\${version}||g;s|mac|linux|g;s|icon.icns|icon.png|g" -i electron-builder.json
-    NODE_ENV=development yarn install --cache-folder "${srcdir}/.yarn_cache"
-    NODE_ENV=production yarn run electron:build
+    NODE_ENV=development    yarn install --cache-folder "${srcdir}/.yarn_cache"
+    NODE_ENV=production     yarn run electron:build
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname%-git}.sh" "${pkgdir}/usr/bin/${pkgname%-git}"
diff --git a/miru-viewer.sh b/miru-viewer.sh
index 4cfe3ac09dd8..40e422ca2ee7 100644
--- a/miru-viewer.sh
+++ b/miru-viewer.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