summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzxp198210052024-02-29 15:43:25 +0800
committerzxp198210052024-02-29 15:43:25 +0800
commit0a31e0a9259d25635307d91e5b06c13f18df5902 (patch)
tree6821a828540df1b50c778629fd8dcbd7fe23d3f7
parentb6813c6e1d43b14addbd1a5b623056ada0519439 (diff)
downloadaur-0a31e0a9259d25635307d91e5b06c13f18df5902.tar.gz
fix errors
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD10
-rw-r--r--ferrum.sh10
3 files changed, 13 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f3c57612d221..e21bbb20df38 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
pkgbase = ferrum-bin
pkgdesc = Music library app for Mac, Linux and Windows
pkgver = 0.17.2
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/probablykasper/ferrum
arch = x86_64
- license = LicenseRef-custom
+ license = LicenseRef-unknown
depends = electron22
depends = hicolor-icon-theme
provides = ferrum=0.17.2
@@ -12,6 +12,6 @@ pkgbase = ferrum-bin
source = ferrum-0.17.2.deb::https://github.com/probablykasper/ferrum/releases/download/v0.17.2/Ferrum-v0.17.2-linux.deb
source = ferrum.sh
sha256sums = 39822b21e5f8571b1fca614a8483b9d2c7cf985cc8b6f4c7a7a9a290de530292
- sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231
+ sha256sums = f80acf84a87f3f50d7c4e2ed22f4d0e8b09dd98a6c26253f2524e5413771eab1
pkgname = ferrum-bin
diff --git a/PKGBUILD b/PKGBUILD
index cc234713863a..6c59fd6a9159 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,11 +3,11 @@ pkgname=ferrum-bin
_pkgname=Ferrum
pkgver=0.17.2
_electronversion=22
-pkgrel=1
+pkgrel=2
pkgdesc="Music library app for Mac, Linux and Windows"
arch=('x86_64')
url="https://github.com/probablykasper/ferrum"
-license=('LicenseRef-custom')
+license=('LicenseRef-unknown')
provides=("${pkgname%-bin}=${pkgver}")
conflicts=("${pkgname%-bin}")
depends=(
@@ -19,13 +19,13 @@ source=(
"${pkgname%-bin}.sh"
)
sha256sums=('39822b21e5f8571b1fca614a8483b9d2c7cf985cc8b6f4c7a7a9a290de530292'
- 'd4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231')
+ 'f80acf84a87f3f50d7c4e2ed22f4d0e8b09dd98a6c26253f2524e5413771eab1')
build() {
sed -e "s|@electronversion@|${_electronversion}|g" \
-e "s|@appname@|${pkgname%-bin}|g" \
- -e "s|@appasar@|app.asar|g" \
+ -e "s|@runname@|app.asar|g" \
-i "${srcdir}/${pkgname%-bin}.sh"
- bsdtar -xf "${srcdir}/data.tar.xz"
+ bsdtar -xf "${srcdir}/data."*
sed "s|/opt/${_pkgname}/${pkgname%-bin}|${pkgname%-bin}|g;s|Audio|AudioVideo|g" \
-i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
}
diff --git a/ferrum.sh b/ferrum.sh
index aacd8f895847..e6784b369c25 100644
--- a/ferrum.sh
+++ b/ferrum.sh
@@ -1,15 +1,15 @@
#!/bin/sh
set -e
_APPDIR="/usr/lib/@appname@"
-_ASAR="${_APPDIR}/@appasar@"
+_RUNNAME="${_APPDIR}/@runname@"
export PATH="${_APPDIR}:${PATH}"
export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
export ELECTRON_IS_DEV=0
+export ELECTRON_FORCE_IS_PACKAGED=true
export NODE_ENV=production
cd "${_APPDIR}"
if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
- exec electron@electronversion@ "${_ASAR}" "$@"
+ exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $?
else
- exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
-fi
-exit \ No newline at end of file
+ exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $?
+fi \ No newline at end of file