fix errors

3 files changed, 34 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7f89b1616244..548d08b1851a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = listen1-desktop-bin
 	pkgdesc = One for all free music in China
 	pkgver = 2.31.0
-	pkgrel = 4
+	pkgrel = 5
 	url = http://listen1.github.io/listen1
 	arch = x86_64
 	license = MIT
@@ -10,11 +10,12 @@ pkgbase = listen1-desktop-bin
 	provides = listen1-desktop=2.31.0
 	conflicts = listen1-desktop
 	conflicts = listen1
+	conflicts = listen1-electron
 	source = listen1-desktop-2.31.0.deb::https://github.com/listen1/listen1_desktop/releases/download/v2.31.0/listen1_2.31.0_linux_amd64.deb
-	source = LICENSE.md::https://raw.githubusercontent.com/listen1/listen1_desktop/v2.31.0/LICENSE.md
+	source = LICENSE-2.31.0.md::https://raw.githubusercontent.com/listen1/listen1_desktop/v2.31.0/LICENSE.md
 	source = listen1-desktop.sh
 	sha256sums = 0623e152524477d1015b2619bb1784d82473de6153b8b78a892783fb9e0894f9
 	sha256sums = d2aa8a82485042b9d5efb8ed2d9c0e8a66e8983bc3f64ebbe35158d35662cdbc
-	sha256sums = d8e6b6ff7d63f31428587d05e8d225e3f7801b6d06736cd3288484cc405d44e0
+	sha256sums = 5ce46265f0335b03568aa06f7b4c57c5f8ffade7a226489ea39796be91a511bf
 
 pkgname = listen1-desktop-bin
diff --git a/PKGBUILD b/PKGBUILD
index 886c92a24d94..872312e70aec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,30 +2,39 @@
 _pkgname=listen1
 pkgname="${_pkgname}-desktop-bin"
 _appname=Listen1
+_electronversion=13
 pkgver=2.31.0
-pkgrel=4
+pkgrel=5
 pkgdesc="One for all free music in China"
 arch=("x86_64")
 url="http://listen1.github.io/listen1"
 _ghurl="https://github.com/listen1/listen1_desktop"
 license=('MIT')
 provides=("${pkgname%-bin}=${pkgver}")
-conflicts=("${pkgname%-bin}" "${pkgname%-desktop-bin}")
+conflicts=(
+    "${pkgname%-bin}"
+    "${_pkgname}"
+    "${_pkgname}-electron"
+)
 depends=(
-    'electron13'
+    "electron${_electronversion}"
     'hicolor-icon-theme'
 )
 source=(
     "${pkgname%-bin}-${pkgver}.deb::${_ghurl}/releases/download/v${pkgver}/${pkgname%-desktop-bin}_${pkgver}_linux_amd64.deb"
-    "LICENSE.md::https://raw.githubusercontent.com/listen1/listen1_desktop/v${pkgver}/LICENSE.md"
+    "LICENSE-${pkgver}.md::https://raw.githubusercontent.com/listen1/listen1_desktop/v${pkgver}/LICENSE.md"
     "${pkgname%-bin}.sh"
 )
 sha256sums=('0623e152524477d1015b2619bb1784d82473de6153b8b78a892783fb9e0894f9'
             'd2aa8a82485042b9d5efb8ed2d9c0e8a66e8983bc3f64ebbe35158d35662cdbc'
-            'd8e6b6ff7d63f31428587d05e8d225e3f7801b6d06736cd3288484cc405d44e0')
+            '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/${_appname}/${_pkgname} %U|${pkgname%-bin}|g;s|Icon=${_pkgname}|Icon=${pkgname%-bin}|g;s|Audio|AudioVideo|g" \
+    sed "s|/opt/${_appname}/${_pkgname}|${pkgname%-bin}|g;s|Icon=${_pkgname}|Icon=${pkgname%-bin}|g;s|Audio|AudioVideo|g" \
         -i "${srcdir}/usr/share/applications/${_pkgname}.desktop"
 }
 package() {
@@ -37,5 +46,5 @@ package() {
             "${pkgdir}/usr/share/icons/hicolor/${_icons}/apps/${pkgname%-bin}.png"
     done
     install -Dm644 "${srcdir}/usr/share/applications/${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname%-bin}.desktop"
-    install -Dm644 "${srcdir}/LICENSE.md" -t "${pkgdir}/usr/share/licenses/${pkgname}"
+    install -Dm644 "${srcdir}/LICENSE-${pkgver}.md" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.md"
 }
\ No newline at end of file
diff --git a/listen1-desktop.sh b/listen1-desktop.sh
index 4217feb55f5f..c77c53567639 100644
--- a/listen1-desktop.sh
+++ b/listen1-desktop.sh
@@ -1,11 +1,17 @@
-#!/bin/bash
-_ELECTRON=/usr/bin/electron13
-APPDIR="/usr/lib/listen1-desktop"
-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