fix errors

3 files changed, 25 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d71324fcec89..688e5e48d2a9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ferrum-bin
 	pkgdesc = Music library app for Mac, Linux and Windows
 	pkgver = 0.17.1
-	pkgrel = 4
+	pkgrel = 5
 	url = https://github.com/probablykasper/ferrum
 	arch = x86_64
 	license = custom
@@ -12,6 +12,6 @@ pkgbase = ferrum-bin
 	source = ferrum-0.17.1.deb::https://github.com/probablykasper/ferrum/releases/download/v0.17.1/Ferrum-v0.17.1-linux.deb
 	source = ferrum.sh
 	sha256sums = 42a0c42c3d24d50ff90fc30a8036023c2721697f855b1a6b02209dfd8602807e
-	sha256sums = 51c96590631edbdcc6bf5a1bc19ed248c63af8c6018aebe3764d2cad97af50fd
+	sha256sums = 5ce46265f0335b03568aa06f7b4c57c5f8ffade7a226489ea39796be91a511bf
 
 pkgname = ferrum-bin
diff --git a/PKGBUILD b/PKGBUILD
index 457f7d2269e6..f3f9a12e9f09 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,8 @@
 pkgname=ferrum-bin
 _pkgname=Ferrum
 pkgver=0.17.1
-pkgrel=4
+_electronversion=19
+pkgrel=5
 pkgdesc="Music library app for Mac, Linux and Windows"
 arch=('x86_64')
 url="https://github.com/probablykasper/ferrum"
@@ -10,7 +11,7 @@ license=('custom')
 provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
 depends=(
-    'electron19'
+    "electron${_electronversion}"
     'hicolor-icon-theme'
 )
 source=(
@@ -18,10 +19,14 @@ source=(
     "${pkgname%-bin}.sh"
 )
 sha256sums=('42a0c42c3d24d50ff90fc30a8036023c2721697f855b1a6b02209dfd8602807e'
-            '51c96590631edbdcc6bf5a1bc19ed248c63af8c6018aebe3764d2cad97af50fd')
+            '5ce46265f0335b03568aa06f7b4c57c5f8ffade7a226489ea39796be91a511bf')
 build() {
+    sed -e "s|@electronversion@|${_electronversion}|g" \
+        -e "s|@appname@|${pkgname%-bin}|g" \
+        -e "s|@appasar@|app.asar|g" \
+        -i "${srcdir}/${pkgname%-bin}.sh"
     bsdtar -xf "${srcdir}/data.tar.xz"
-    sed "s|/opt/${_pkgname}/${pkgname%-bin} %U|${pkgname%-bin}|g;s|Audio|AudioVideo|g" \
+    sed "s|/opt/${_pkgname}/${pkgname%-bin}|${pkgname%-bin}|g;s|Audio|AudioVideo|g" \
         -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
 }
 package() {
diff --git a/ferrum.sh b/ferrum.sh
index e97003991e0f..c77c53567639 100644
--- a/ferrum.sh
+++ b/ferrum.sh
@@ -1,11 +1,17 @@
-#!/bin/bash
-_ELECTRON=/usr/bin/electron19
-APPDIR="/usr/lib/ferrum"
-export PATH="${APPDIR}:${PATH}"
-#export LD_LIBRARY_PATH="${APPDIR}/swiftshader:${LD_LIBRARY_PATH}"
-_ASAR="${APPDIR}/app.asar"
+#!/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
+export NODE_ENV=production
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec ${_ELECTRON} ${_ASAR} "$@"
+    cd "${_APPDIR}"
+    exec electron@electronversion@ "${_ASAR}" "$@"
+    exit
 else
-    exec ${_ELECTRON} ${_ASAR} --no-sandbox "$@"
+    cd "${_APPDIR}"
+    exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
+    exit
 fi
\ No newline at end of file