update to 1.1.0

3 files changed, 31 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 60d1f0faca98..20fcc4685dbc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ytm-dlp-gui
 	pkgdesc = An ElectronJS app for downloading music off Youtube Music.
-	pkgver = 1.0.4
+	pkgver = 1.1.0
 	pkgrel = 1
 	url = https://github.com/RENOMIZER/ytm-dlp-gui
 	arch = x86_64
@@ -8,13 +8,12 @@ pkgbase = ytm-dlp-gui
 	makedepends = gendesk
 	makedepends = npm
 	makedepends = nodejs
-	makedepends = imagemagick
 	makedepends = git
 	depends = electron26
 	conflicts = ytm-dlp-gui
-	source = ytm-dlp-gui-1.0.4::git+https://github.com/RENOMIZER/ytm-dlp-gui.git#tag=v1.0.4
+	source = ytm-dlp-gui-1.1.0::git+https://github.com/RENOMIZER/ytm-dlp-gui.git#tag=v1.1.0
 	source = ytm-dlp-gui.sh
 	sha256sums = SKIP
-	sha256sums = 8a6d09a6056bcb4c8144ead0d664f731325f08c3487ed57a32a3de0422ff9062
+	sha256sums = 8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84
 
 pkgname = ytm-dlp-gui
diff --git a/PKGBUILD b/PKGBUILD
index 94c82829acc9..5321617b5307 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,8 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=ytm-dlp-gui
-pkgver=1.0.4
+_pkgname=YTM-DLP-GUI
+pkgver=1.1.0
+_electronversion=26
 pkgrel=1
 pkgdesc="An ElectronJS app for downloading music off Youtube Music."
 arch=('x86_64')
@@ -8,13 +10,12 @@ url="https://github.com/RENOMIZER/ytm-dlp-gui"
 license=('ISC')
 conflicts=("${pkgname}")
 depends=(
-    'electron26'
+    "electron${_electronversion}"
 )
 makedepends=(
     'gendesk'
     'npm'
     'nodejs'
-    'imagemagick'
     'git'
 )
 source=(
@@ -22,19 +23,27 @@ source=(
     "${pkgname}.sh"
 )
 sha256sums=('SKIP'
-            '8a6d09a6056bcb4c8144ead0d664f731325f08c3487ed57a32a3de0422ff9062')
+            '8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84')
 build() {
+    sed -e "s|@electronversion@|${_electronversion}|" \
+        -e "s|@appname@|${pkgname}|g" \
+        -e "s|@appasar@|app.asar|g" \
+        -i "${srcdir}/${pkgname}.sh"
     gendesk -q -f -n --categories "Utility" --name "${pkgname}" --exec "${pkgname}"
     cd "${srcdir}/${pkgname}-${pkgver}"
-    sed '46,49d' -i forge.config.js
-    npm install --cache "${srcdir}/npm-cache" 
+    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 ELECTRONVERSION="${_electronversion}"
+    sed '64,80d' -i forge.config.js
+    npm install
     npm run package
-    convert "${srcdir}/${pkgname}-${pkgver}/src/images/icon.ico" "${srcdir}/${pkgname}.png"
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
-    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/out/${pkgname}-linux-x64/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname}"
+    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/out/${_pkgname}-linux-x64/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname}"
     install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
-    install -Dm644 "${srcdir}/${pkgname}-0.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/src/images/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
     install -Dm644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
\ No newline at end of file
diff --git a/ytm-dlp-gui.sh b/ytm-dlp-gui.sh
index 7a2cff1cf9cd..2ec4412e5c4f 100644
--- a/ytm-dlp-gui.sh
+++ b/ytm-dlp-gui.sh
@@ -1,10 +1,14 @@
 #!/bin/bash
-_ELECTRON=/usr/bin/electron26
-APPDIR="/usr/lib/ytm-dlp-gui"
-export PATH="${APPDIR}:${PATH}"
-_ASAR="${APPDIR}/app.asar"
+set -e
+_APPDIR="/usr/lib/@appname@"
+export PATH="${_APPDIR}:${PATH}"
+export ELECTRON_IS_DEV=0
+export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
+_ASAR="${_APPDIR}/@appasar@"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec ${_ELECTRON} ${_ASAR} "$@"
+    cd "${_APPDIR}"
+    exec electron@electronversion@ "${_ASAR}" "$@"
 else
-    exec ${_ELECTRON} ${_ASAR} --no-sandbox "$@"
+    cd "${_APPDIR}"
+    exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
 fi
\ No newline at end of file