summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzxp198210052023-11-14 11:07:45 +0800
committerzxp198210052023-11-14 11:07:45 +0800
commit34e05998b89c10e1c7b7b116d4be6ef65ad997cd (patch)
tree285f2b2e474328935be8e2f068102c2982762f41
parent28aeaab29028f3f10f9f0f70646fc6508c539543 (diff)
downloadaur-34e05998b89c10e1c7b7b116d4be6ef65ad997cd.tar.gz
fix errors
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD22
-rw-r--r--ficus.sh5
3 files changed, 19 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8178c585d079..32b2c0292895 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -6,7 +6,6 @@ pkgbase = ficus-bin
arch = x86_64
license = MIT
makedepends = gendesk
- depends = bash
depends = electron13
provides = ficus=0.2.1
conflicts = ficus
@@ -18,6 +17,6 @@ pkgbase = ficus-bin
sha256sums = fb3a407722baa7b48b81db2753ae12f47799a3a434122d47db8b320c6c4ba993
sha256sums = 062dfd6ae4c19f555ebbdba752598c98510837687393a38a3602b711890430d7
sha256sums = 3c8344b3daac5c775a3bf38518e5eee024566d7ea0a3f72c543a7c7ae13f72ef
- sha256sums = fe17973210b46d11cfaad9baa7c821f64a26667a77ba8ca483ea8acfb1fab525
+ sha256sums = cf6a9a3f259d0760bd8ec9462c020294a11e930a1034956f8f8e9bb88aef128c
pkgname = ficus-bin
diff --git a/PKGBUILD b/PKGBUILD
index 7df6ac27de45..5638da9bd1a8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,22 +9,28 @@ _githuburl="https://github.com/Thysrael/Ficus"
license=('MIT')
provides=("${pkgname%-bin}=${pkgver}")
conflicts=("${pkgname%-bin}" "${pkgname%-bin}-desktop")
-depends=('bash' 'electron13')
-makedepends=('gendesk')
-source=("${pkgname%-bin}-${pkgver}.asar::${_githuburl}/releases/download/v${pkgver}/app.asar"
+depends=(
+ 'electron13'
+)
+makedepends=(
+ 'gendesk'
+)
+source=(
+ "${pkgname%-bin}-${pkgver}.asar::${_githuburl}/releases/download/v${pkgver}/app.asar"
"https://raw.githubusercontent.com/Thysrael/Ficus/v${pkgver}/LICENSE"
"${pkgname%-bin}.png::https://raw.githubusercontent.com/Thysrael/Ficus/v${pkgver}/build/icon.png"
- "${pkgname%-bin}.sh")
+ "${pkgname%-bin}.sh"
+)
sha256sums=('fb3a407722baa7b48b81db2753ae12f47799a3a434122d47db8b320c6c4ba993'
'062dfd6ae4c19f555ebbdba752598c98510837687393a38a3602b711890430d7'
'3c8344b3daac5c775a3bf38518e5eee024566d7ea0a3f72c543a7c7ae13f72ef'
- 'fe17973210b46d11cfaad9baa7c821f64a26667a77ba8ca483ea8acfb1fab525')
-prepare() {
- gendesk -f -n --categories "Utility" --name "Ficus" --exec "${pkgname%-bin}"
+ 'cf6a9a3f259d0760bd8ec9462c020294a11e930a1034956f8f8e9bb88aef128c')
+build() {
+ gendesk -q -f -n --categories "Utility" --name "Ficus" --exec "${pkgname%-bin}"
}
package() {
install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
- install -Dm644 "${srcdir}/${pkgname%-bin}-${pkgver}.asar" "${pkgdir}/opt/${pkgname%-bin}/${pkgname%-bin}.asar"
+ install -Dm644 "${srcdir}/${pkgname%-bin}-${pkgver}.asar" "${pkgdir}/usr/lib/${pkgname%-bin}/app.asar"
install -Dm644 "${srcdir}/${pkgname%-bin}.png" -t "${pkgdir}/usr/share/pixmaps"
install -Dm644 "${srcdir}/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
install -Dm644 "${srcdir}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/ficus.sh b/ficus.sh
index d39c6d4475b0..9399ba771b1c 100644
--- a/ficus.sh
+++ b/ficus.sh
@@ -1,6 +1,9 @@
#!/bin/bash
_ELECTRON=/usr/bin/electron13
-_ASAR="/opt/ficus/ficus.asar"
+APPDIR="/usr/lib/ficus"
+export PATH="${APPDIR}:${PATH}"
+#export LD_LIBRARY_PATH="${APPDIR}/swiftshader:${LD_LIBRARY_PATH}"
+_ASAR="${APPDIR}/app.asar"
if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
exec ${_ELECTRON} ${_ASAR} "$@"
else