Makefile neu, Versionsupdatev0.2

3 files changed, 61 insertions, 7 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..67c55f5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+doalogwatch
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..0b2ff38
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,53 @@
+#
+#  logwatch-extra - extra-capabilities for logwatch: better cron-frontend
+#
+#  Copyright (c) 2013-2016 Erich Eckner <opensource at eckner dot net>
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+#  USA.
+#
+
+DESTDIR	 =
+ETCDIR   = /etc
+BINDIR	 = /usr/bin
+CACHEDIR = /var/cache
+MANDIR	 = /usr/share/man
+TMPDIR   = /tmp
+WAITDIR  = /home/shutdown/.warteauf
+
+VERSION  = 0.2
+
+all: doalogwatch
+
+%: %.in
+	sed "s/#VERSION#/$(VERSION)/;  \
+		s@#BINDIR#@$(BINDIR)@; \
+		s@#ETCDIR#@$(ETCDIR)@; \
+		s@#CACHEDIR#@$(CACHEDIR)@; \
+		s@#WAITDIR#@$(WAITDIR)@; \
+		s@#TMPDIR#@$(TMPDIR)@" \
+			$< > $@
+
+.PHONY:	install clean
+
+install: all
+	install -D -m0755 -t $(DESTDIR)$(BINDIR) doalogwatch
+	install -d $(DESTDIR)$(CACHEDIR)/logwatch
+	date +%F > $(DESTDIR)$(CACHEDIR)/logwatch/letzteMeldung
+
+clean:
+	rm -f doalogwatch
+
+# End of file
diff --git a/doalogwatch b/doalogwatch.in
index d956659..c479cbf 100755
--- a/doalogwatch
+++ b/doalogwatch.in
@@ -1,27 +1,27 @@
 #!/bin/bash
 
-set -o pipefail
+# doalogwatch, part of logwatch-extra version #VERSION#
 
 abWannNaechstesMal="$(date +%F)"
-lmDatei="/var/cache/logwatch/letzteMeldung"
+lmDatei="#CACHEDIR#/logwatch/letzteMeldung"
 
 [ "${abWannNaechstesMal}" == "$(cat "${lmDatei}")" ] && exit 0
 
-warteAufFile="/home/shutdown/.warteauf/logwatch"
+warteAufFile="#WAITDIR#/logwatch"
 touch ${warteAufFile} || exit 1
 
 [ $(cat /proc/uptime | cut -d ' ' -f 1 | sed "s/\..*\$//") -gt 300 ] || exit 11
 
 # check for currently running backups
-ps aux | grep -v "\sgrep\s" | grep -q "\s\(/usr/bin/\)\?backup\s" && exit 11
-if [ -x /etc/backup.conf ]
+ps aux | grep -v "\sgrep\s" | grep -q "\s\(#BINDIR#/\)\?backup\s" && exit 11
+if [ -x #ETCDIR#/backup.conf ]
 then
-  . /etc/backup.conf
+  . #ETCDIR#/backup.conf
   for i in 1 2
   do
     for id in "${!backups[@]}"
     do
-      [ -e "/tmp/${id}.pid" ] && exit 11
+      [ -e "#TMPDIR#/${id}.pid" ] && exit 11
     done
     sleep 1
   done