fix acme.sh.service replacements

2 files changed, 13 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 468b53b17b90..3e2fa43094b0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,13 @@
 pkgbase = acme.sh-systemd
 	pkgdesc = Use systemd check for acme.sh (Let’s Encrypt) renewals
 	pkgver = 0.1.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/unknowndev233/acme.sh-systemd
 	arch = any
 	license = LGPL3
 	depends = systemd>=240
 	depends = acme.sh
-	backup = etc/acme.sh
-	source = acme.sh-systemd-0.1.0::https://github.com/unknowndev233/acme.sh-systemd/archive/v0.1.0.tar.gz
+	source = acme.sh-systemd-0.1.0.tar.gz::https://github.com/unknowndev233/acme.sh-systemd/archive/v0.1.0.tar.gz
 	sha512sums = f63a106a4c9890ba466a19a475ccbe4ab88e122ffae295df3c78135e664eb52d13ebf2a296655f66c92ac981dfd98f899c4954bab793f162e316eb59ab6c903a
 
 pkgname = acme.sh-systemd
diff --git a/PKGBUILD b/PKGBUILD
index 3bc3c35ac04b..bbb5425911ca 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,20 +2,22 @@
 
 pkgname=acme.sh-systemd
 pkgver=0.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Use systemd check for acme.sh (Let’s Encrypt) renewals"
 arch=('any')
-url="https://github.com/unknowndev233/acme.sh-systemd"
+url="https://github.com/unknowndev233/${pkgname}"
 license=('LGPL3')
 depends=('systemd>=240' 'acme.sh')
-backup=('etc/acme.sh')
-source=("${pkgname}-${pkgver}::https://github.com/unknowndev233/${pkgname}/archive/v${pkgver}.tar.gz")
+backup=()
+source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz")
 sha512sums=('f63a106a4c9890ba466a19a475ccbe4ab88e122ffae295df3c78135e664eb52d13ebf2a296655f66c92ac981dfd98f899c4954bab793f162e316eb59ab6c903a')
 
 package() {
-	sed -i '7 s/#Type=exec/Type=exec/'                            "$srcdir/${pkgname}-${pkgver}/acme.sh.service"
-	sed -i '8 s/Type=simple/#Type=simple/'                        "$srcdir/${pkgname}-${pkgver}/acme.sh.service"
-	install -Dm644 "$srcdir/${pkgname}-${pkgver}/acme.sh.service" "$pkgdir/usr/lib/systemd/system/acme.sh.service"
-	install -Dm644 "$srcdir/${pkgname}-${pkgver}/acme.sh.timer"   "$pkgdir/usr/lib/systemd/system/acme.sh.timer"
-	mkdir -pm 0700 "$pkgdir/{etc,var/log}/acme.sh"
+    cd "${pkgname}-${pkgver}"
+    sed -i '6 s/#Type=exec/Type=exec/'            "acme.sh.service"
+    sed -i '7 s/Type=simple/#Type=simple/'        "acme.sh.service"
+    install -Dm644 "acme.sh.service" -t           "${pkgdir}/usr/lib/systemd/system"
+    install -Dm644 "acme.sh.timer" -t             "${pkgdir}/usr/lib/systemd/system"
+#    install -Dm640 "account.conf" -t              "${pkgdir}/etc/acme.sh"
+    mkdir -pm 0700 ${pkgdir}/{etc,var/log}/acme.sh
 }