fix errors

3 files changed, 25 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b62058874c94..9ae2273357ec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ytdl-desktop
 	pkgdesc = Youtube Downloader Desktop
 	pkgver = 1.0.0
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/kayy0812/ytdl-desktop
 	arch = x86_64
 	license = MIT
@@ -12,9 +12,9 @@ pkgbase = ytdl-desktop
 	makedepends = git
 	depends = electron25
 	conflicts = ytdl-desktop
-	source = ytdl-desktop-1.0.0::git+https://github.com/kayy0812/ytdl-desktop.git#tag=v1.0.0
+	source = ytdl-desktop.git::git+https://github.com/kayy0812/ytdl-desktop.git#tag=v1.0.0
 	source = ytdl-desktop.sh
 	sha256sums = SKIP
-	sha256sums = d20ac014ef92dcda76146fa30a2bdd1803f17a350018c59ffec6ad7867947e61
+	sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231
 
 pkgname = ytdl-desktop
diff --git a/PKGBUILD b/PKGBUILD
index 6852f3eecd60..73dd9bb7f944 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@ pkgname=ytdl-desktop
 _pkgname="Youtube Downloader Desktop"
 pkgver=1.0.0
 _electronversion=25
-pkgrel=3
+pkgrel=4
 pkgdesc="Youtube Downloader Desktop"
 arch=('x86_64')
 url="https://github.com/kayy0812/ytdl-desktop"
@@ -20,27 +20,27 @@ makedepends=(
     'git'
 )
 source=(
-    "${pkgname}-${pkgver}::git+${url}.git#tag=v${pkgver}"
+    "${pkgname}.git::git+${url}.git#tag=v${pkgver}"
     "${pkgname}.sh"
 )
 sha256sums=('SKIP'
-            'd20ac014ef92dcda76146fa30a2bdd1803f17a350018c59ffec6ad7867947e61')
+            'd4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231')
 build() {
     sed -i "s|@electronversion@|${_electronversion}|" "$srcdir/${pkgname%-bin}.sh"
     gendesk -f -n -q --categories "Utility" --name "${_pkgname}" --exec "${pkgname}"
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    sed '23,26d' -i forge.config.js
-    yarn config set cache-folder "${srcdir}/yarn_cache"
+    cd "${srcdir}/${pkgname}.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 ELECTRONVERSION="${_electronversion}"
-    yarn install
-    yarn package
+    sed '23,26d' -i forge.config.js
+    yarn install --cache-folder "${srcdir}/.yarn_cache"
+    yarn run package
 }
 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}.git/out/${pkgname}-linux-"*/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname}"
+    cp -r "${srcdir}/${pkgname}.git/out/${pkgname}-linux-"*/resources/app.asar.unpacked "${pkgdir}/usr/lib/${pkgname}"
     install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
-    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/out/${pkgname}-linux-x64//LICENSE"* -t "${pkgdir}/usr/share/licenses/${pkgname}"
+    install -Dm644 "${srcdir}/${pkgname}.git/out/${pkgname}-linux-"*/LICENSE* -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
\ No newline at end of file
diff --git a/ytdl-desktop.sh b/ytdl-desktop.sh
index a36bc4d3c088..aacd8f895847 100644
--- a/ytdl-desktop.sh
+++ b/ytdl-desktop.sh
@@ -1,12 +1,15 @@
-#!/bin/bash
-APPDIR="/usr/lib/ytdl-desktop"
-export PATH="${APPDIR}:${PATH}"
+#!/bin/sh
+set -e
+_APPDIR="/usr/lib/@appname@"
+_ASAR="${_APPDIR}/@appasar@"
+export PATH="${_APPDIR}:${PATH}"
+export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
 export ELECTRON_IS_DEV=0
-_ASAR="${APPDIR}/app.asar"
+export NODE_ENV=production
+cd "${_APPDIR}"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    cd "$APPDIR"
-    exec electron@electronversion@ ${_ASAR} "$@"
+    exec electron@electronversion@ "${_ASAR}" "$@"
 else
-    cd "$APPDIR"
-    exec electron@electronversion@ ${_ASAR} --no-sandbox "$@"
-fi
\ No newline at end of file
+    exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
+fi
+exit
\ No newline at end of file