upgpkg: espanso-git v0.2.4.r15.gf277558-1

Update to v0.3.0

3 files changed, 12 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f3032bf4f5d1..f51c24de13e7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = espanso-git
 	pkgdesc = Cross-platform Text Expander written in Rust
-	pkgver = v0.2.4.r0.g7d3a017
+	pkgver = v0.2.4.r15.gf277558
 	pkgrel = 1
 	url = https://espanso.org/
 	install = espanso-git.install
@@ -13,10 +13,8 @@ pkgbase = espanso-git
 	depends = libxtst
 	provides = espanso
 	conflicts = espanso
-	source = espanso::git+https://github.com/federico-terzi/espanso.git
-	source = service
+	source = espanso::git+https://github.com/federico-terzi/espanso.git#branch=dev
 	sha512sums = SKIP
-	sha512sums = 5eb7b751e9432c7dde71da1f0c8c459b33a6a15d3a81aa21cbaa251b7b2cdddc47da9a0ab22215a9fb063ecdd8123c86c8f96459e627fd6daff4e690ff1a6df2
 
 pkgname = espanso-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 617739b07e9b..aa2f4ab17b1a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
-# Maintainer: Your Name <youremail@domain.com>
+# Maintainer: Sefa Eyeoglu <contact@scrumplex.net>
 
+_branch=dev
 _pkgname=espanso
 pkgname=${_pkgname}-git
-pkgver=v0.2.4.r0.g7d3a017
+pkgver=v0.2.4.r15.gf277558
 pkgrel=1
 pkgdesc="Cross-platform Text Expander written in Rust"
 arch=(x86_64)
@@ -13,10 +14,8 @@ makedepends=("rust" "git")
 provides=($_pkgname)
 conflicts=($_pkgname)
 install="${pkgname}.install"
-source=("${_pkgname}::git+https://github.com/federico-terzi/espanso.git"
-        "service")
-sha512sums=('SKIP'
-            '5eb7b751e9432c7dde71da1f0c8c459b33a6a15d3a81aa21cbaa251b7b2cdddc47da9a0ab22215a9fb063ecdd8123c86c8f96459e627fd6daff4e690ff1a6df2')
+source=("${_pkgname}::git+https://github.com/federico-terzi/espanso.git#branch=${_branch}")
+sha512sums=('SKIP')
 
 
 pkgver() {
@@ -25,10 +24,12 @@ pkgver() {
     git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-check() {
+prepare() {
     cd "$_pkgname"
 
-    cargo test --release --locked
+    # 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"
 }
 
 build() {
@@ -41,7 +42,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 -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