summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzxp198210052024-03-14 15:02:29 +0800
committerzxp198210052024-03-14 15:02:29 +0800
commit213c9da187cb5af80b69c9b48ef41053295402d3 (patch)
tree50b9ee1cd6c040fd39dffd46431abbdff67b67e8
parent564f12fcdc5e094ae1c2f4bf257d213f907dd70f (diff)
downloadaur-213c9da187cb5af80b69c9b48ef41053295402d3.tar.gz
fix errors
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD7
-rw-r--r--fontastic.sh7
3 files changed, 11 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 298be6137f0a..2a5d3a106c65 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,16 @@
pkgbase = fontastic-bin
pkgdesc = A stunning font management and cataloging application.
pkgver = 0.2.0
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/tomshaw/fontastic
arch = x86_64
license = MIT
- depends = electron25
+ depends = electron25-bin
source = fontastic-0.2.0.deb::https://github.com/tomshaw/fontastic/releases/download/v0.2.0/Fontastic-0.2.0-amd64.deb
source = LICENSE-0.2.0::https://raw.githubusercontent.com/tomshaw/fontastic/v0.2.0/LICENSE
source = fontastic.sh
sha256sums = 3b34a974d7da78f9621b02e11a35c00d9f81a19ec42ed1dddfc4f4d59d67d962
sha256sums = d461d5796257402081b89cae64365068a66d193696f7c64cb7e6fd307b4a48d9
- sha256sums = f80acf84a87f3f50d7c4e2ed22f4d0e8b09dd98a6c26253f2524e5413771eab1
+ sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8
pkgname = fontastic-bin
diff --git a/PKGBUILD b/PKGBUILD
index fd3537a1b9a7..a09b3614ec95 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,14 @@ pkgname=fontastic-bin
_pkgname=Fontastic
pkgver=0.2.0
_electronversion=25
-pkgrel=2
+pkgrel=3
pkgdesc="A stunning font management and cataloging application."
arch=('x86_64')
url="https://github.com/tomshaw/fontastic"
license=('MIT')
conflits=("${pkgname%-bin}")
depends=(
- "electron${_electronversion}"
+ "electron${_electronversion}-bin"
)
source=(
"${pkgname%-bin}-${pkgver}.deb::${url}/releases/download/v${pkgver}/${_pkgname}-${pkgver}-amd64.deb"
@@ -19,11 +19,12 @@ source=(
)
sha256sums=('3b34a974d7da78f9621b02e11a35c00d9f81a19ec42ed1dddfc4f4d59d67d962'
'd461d5796257402081b89cae64365068a66d193696f7c64cb7e6fd307b4a48d9'
- 'f80acf84a87f3f50d7c4e2ed22f4d0e8b09dd98a6c26253f2524e5413771eab1')
+ 'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8')
build() {
sed -e "s|@electronversion@|${_electronversion}|" \
-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/${_pkgname}/${pkgname%-bin}|${pkgname%-bin}|g" -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
diff --git a/fontastic.sh b/fontastic.sh
index e6784b369c25..7ddcaab8d734 100644
--- a/fontastic.sh
+++ b/fontastic.sh
@@ -1,7 +1,8 @@
-#!/bin/sh
+#!/bin/bash
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