Fix timer unit and add info after install to run it directly if needed

By default, tuptime will run after the next reboot.

4 files changed, 24 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fd89960c8a22..7863ad5d024b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
 pkgbase = tuptime
 	pkgdesc = Report the historical and statistical running time of system
 	pkgver = 3.4.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/rfrail3/tuptime
+	install = tuptime.install
 	arch = any
 	license = GPL
 	depends = python
-	optdepends = cron
 	source = tuptime-3.4.2.tar.gz::https://github.com/rfrail3/tuptime/archive/3.4.2.tar.gz
 	sha256sums = 784bfcd3026128cf7addaaf821f2f5a9c1d1626f5dd83b3b138090f6fb346e9e
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..03e2a0177793
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+tuptime-*.tar
+tuptime-*.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 36a209624381..6854491e7447 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,29 @@
 # Maintainer: Dennis Stengele <d.stengele (at) derintendant (dot) de>
 pkgname=tuptime
 pkgver=3.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Report the historical and statistical running time of system"
 arch=('any')
 url="https://github.com/rfrail3/tuptime"
 license=('GPL')
-groups=()
 depends=(
           'python'
         )
-makedepends=()
-optdepends=('cron')
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=()
-install=
-changelog=
+install=tuptime.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/rfrail3/tuptime/archive/${pkgver}.tar.gz")
-noextract=()
 sha256sums=('784bfcd3026128cf7addaaf821f2f5a9c1d1626f5dd83b3b138090f6fb346e9e')
 
-package() {
+prepare() {
     cd "$srcdir/$pkgname-${pkgver}"
+    sed -i '/Requires=tuptime.service/d' "src/systemd/tuptime-cron.service"
+    sed -i '/User=tuptime/d' "src/systemd/tuptime-cron.service"
+}
 
-    install -Dm755 "src/tuptime" "$pkgdir/usr/bin/tuptime"
-    install -Dm644 "src/systemd/tuptime-cron.service" "$pkgdir/usr/lib/systemd/system/tuptime-cron.service"
-    install -Dm644 "src/systemd/tuptime-cron.timer" "$pkgdir/usr/lib/systemd/system/tuptime-cron.timer"
+package() {
+    cd "$srcdir/$pkgname-${pkgver}"
+    install -D -m755 "src/tuptime" "$pkgdir/usr/bin/tuptime"
+    install -D -m644 "src/systemd/tuptime-cron.service" "$pkgdir/usr/lib/systemd/system/tuptime.service"
+    install -D -m644 "src/systemd/tuptime-cron.timer" "$pkgdir/usr/lib/systemd/system/tuptime.timer"
+    install -d -m755 "$pkgdir/usr/lib/systemd/system/timers.target.wants"
+    ln -s "../tuptime.timer" "$pkgdir/usr/lib/systemd/system/timers.target.wants/tuptime.timer"
 }
diff --git a/tuptime.install b/tuptime.install
new file mode 100644
index 000000000000..322af1692d18
--- /dev/null
+++ b/tuptime.install
@@ -0,0 +1,7 @@
+post_install() {
+    echo ""
+    echo "tuptime has been installed and the corresponding .timer unit"
+    echo "has been enabled. To start tuptime now, run"
+    echo "    # systemctl start tuptime.timer"
+    echo ""
+}