summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzxp198210052024-03-21 15:59:28 +0800
committerzxp198210052024-03-21 15:59:28 +0800
commitbe9d52b39d97c9848ffacd9760182d4c06e866af (patch)
treefb467fb04299bb85c7d684af022de70197e761ac
parent25323509fa4e940c6f655db061be945ea09cc81e (diff)
downloadaur-be9d52b39d97c9848ffacd9760182d4c06e866af.tar.gz
fix errors
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD8
-rw-r--r--listen1-desktop.sh5
3 files changed, 10 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 679de846eff3..efbf25cbd03d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,11 @@
pkgbase = listen1-desktop-bin
pkgdesc = One for all free music in China
pkgver = 2.31.0
- pkgrel = 7
+ pkgrel = 8
url = http://listen1.github.io/listen1
arch = x86_64
license = MIT
- depends = electron13
- depends = hicolor-icon-theme
+ depends = electron13-bin
provides = listen1-desktop=2.31.0
conflicts = listen1-desktop
conflicts = listen1
@@ -16,6 +15,6 @@ pkgbase = listen1-desktop-bin
source = listen1-desktop.sh
sha256sums = 0623e152524477d1015b2619bb1784d82473de6153b8b78a892783fb9e0894f9
sha256sums = d2aa8a82485042b9d5efb8ed2d9c0e8a66e8983bc3f64ebbe35158d35662cdbc
- sha256sums = 50b10386d13e5bec806aeb78f819c4edd0208a4d184332e53866c802731217fe
+ sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8
pkgname = listen1-desktop-bin
diff --git a/PKGBUILD b/PKGBUILD
index 244ad928424e..36d08b47d1d8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgname="${_pkgname}-desktop-bin"
_appname=Listen1
_electronversion=13
pkgver=2.31.0
-pkgrel=7
+pkgrel=8
pkgdesc="One for all free music in China"
arch=("x86_64")
url="http://listen1.github.io/listen1"
@@ -17,8 +17,7 @@ conflicts=(
"${_pkgname}-electron"
)
depends=(
- "electron${_electronversion}"
- 'hicolor-icon-theme'
+ "electron${_electronversion}-bin"
)
source=(
"${pkgname%-bin}-${pkgver}.deb::${_ghurl}/releases/download/v${pkgver}/${pkgname%-desktop-bin}_${pkgver}_linux_amd64.deb"
@@ -27,11 +26,12 @@ source=(
)
sha256sums=('0623e152524477d1015b2619bb1784d82473de6153b8b78a892783fb9e0894f9'
'd2aa8a82485042b9d5efb8ed2d9c0e8a66e8983bc3f64ebbe35158d35662cdbc'
- '50b10386d13e5bec806aeb78f819c4edd0208a4d184332e53866c802731217fe')
+ 'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8')
build() {
sed -e "s|@electronversion@|${_electronversion}|g" \
-e "s|@appname@|${pkgname%-bin}|g" \
-e "s|@runname@|app.asar|g" \
+ -e "s|@options@||g" \
-i "${srcdir}/${pkgname%-bin}.sh"
bsdtar -xf "${srcdir}/data."*
sed "s|/opt/${_appname}/${_pkgname}|${pkgname%-bin}|g;s|Icon=${_pkgname}|Icon=${pkgname%-bin}|g;s|Audio|AudioVideo|g" \
diff --git a/listen1-desktop.sh b/listen1-desktop.sh
index 86cb3dc6a9bf..7ddcaab8d734 100644
--- a/listen1-desktop.sh
+++ b/listen1-desktop.sh
@@ -2,6 +2,7 @@
set -e
_APPDIR="/usr/lib/@appname@"
_RUNNAME="${_APPDIR}/@runname@"
+_OPTIONS="@options@"
export PATH="${_APPDIR}:${PATH}"
export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
export ELECTRON_IS_DEV=0
@@ -9,7 +10,7 @@ export ELECTRON_FORCE_IS_PACKAGED=true
export NODE_ENV=production
cd "${_APPDIR}"
if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
- exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $?
+ exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "$@" || exit $?
else
- exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $?
+ exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "$@" || exit $?
fi \ No newline at end of file