summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD20
-rw-r--r--service8
3 files changed, 15 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e77c308c5ef1..5841c6df822f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = espanso
pkgdesc = Cross-platform Text Expander written in Rust
- pkgver = 0.2.4
+ pkgver = 0.3.0
pkgrel = 1
url = https://espanso.org/
install = espanso.install
@@ -11,10 +11,8 @@ pkgbase = espanso
depends = xdotool
depends = xclip
depends = libxtst
- source = espanso::git+https://github.com/federico-terzi/espanso.git#tag=v0.2.4
- source = service
+ source = espanso::git+https://github.com/federico-terzi/espanso.git#tag=v0.3.0
sha512sums = SKIP
- sha512sums = 5eb7b751e9432c7dde71da1f0c8c459b33a6a15d3a81aa21cbaa251b7b2cdddc47da9a0ab22215a9fb063ecdd8123c86c8f96459e627fd6daff4e690ff1a6df2
pkgname = espanso
diff --git a/PKGBUILD b/PKGBUILD
index a7b6452bfe1e..26af3e31cb6f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
-# Maintainer: Your Name <youremail@domain.com>
+# Maintainer: Sefa Eyeoglu <contact@scrumplex.net>
_pkgname=espanso
pkgname=${_pkgname}
-pkgver=0.2.4
+pkgver=0.3.0
pkgrel=1
pkgdesc="Cross-platform Text Expander written in Rust"
arch=(x86_64)
@@ -11,12 +11,18 @@ license=("GPL3")
depends=("xdotool" "xclip" "libxtst")
makedepends=("rust" "git")
install="${pkgname}.install"
-source=("${_pkgname}::git+https://github.com/federico-terzi/espanso.git#tag=v${pkgver}"
- "service")
-sha512sums=('SKIP'
- '5eb7b751e9432c7dde71da1f0c8c459b33a6a15d3a81aa21cbaa251b7b2cdddc47da9a0ab22215a9fb063ecdd8123c86c8f96459e627fd6daff4e690ff1a6df2')
+source=("${_pkgname}::git+https://github.com/federico-terzi/espanso.git#tag=v${pkgver}")
+sha512sums=('SKIP')
+prepare() {
+ cd "$_pkgname"
+
+ # don't change the original service file, as it will be embedded in the binary
+ cp "src/res/linux/systemd.service" "systemd.service"
+ sed -i "s|{{{espanso_path}}}|/usr/bin/espanso|g" "systemd.service"
+}
+
check() {
cd "$_pkgname"
@@ -33,7 +39,7 @@ package() {
cd "$_pkgname"
install -Dm755 "target/release/${_pkgname}" "${pkgdir}/usr/bin/${_pkgname}"
- install -Dm644 "../service" "${pkgdir}/usr/lib/systemd/user/${_pkgname}.service"
+ install -Dm644 "systemd.service" "${pkgdir}/usr/lib/systemd/user/${_pkgname}.service" # install our own copy
install -Dm644 "README.md" "${pkgdir}/usr/share/doc/${_pkgname}/README.md"
}
diff --git a/service b/service
deleted file mode 100644
index 8c6ad438113c..000000000000
--- a/service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Espanso daemon
-
-[Service]
-ExecStart=/usr/bin/espanso daemon
-
-[Install]
-WantedBy=default.target