M4 patch (#10)

* use m4 to sed make params

* fix install and uninstall conditions

* add ifneq BINNAME

* remove single quotes fron BINNAME

* fix BINNAME condition

* rm destdir from libdir sed

* sed version via makefile

* Nakefile: fix uninstall

* MAKEFILE: add HAVEMAN

* rename systemd-sysusers -> sysusers

* Makefile: fix BINNAME condition

* Makefile: check if PREFIX is defined

* lib: skip comment lines when parsing the conf file (#11)

* lib: skip comment lines when parsing the conf file

* fix missing phony targets
change rc to openrc
change defaults

Author: udeved

Makefile

@@ -1,48 +1,151 @@
-LIBS = common.sh
-CONFFILES = test/*
+VERSION = 0.4.6
+SYSCONFDIR = /etc
+ifdef PREFIX
 PREFIX = /usr/local
-BINDIR = /bin
-LIBDIR = /lib
-MANDIR = /share/man
-DOCDIR = /share/doc/opensysusers
-CONFDIR = /run/sysusers.d
+endif
+BINDIR = $(PREFIX)/bin
+LIBDIR = $(PREFIX)/lib
+MANDIR = $(PREFIX)/share/man
+DOCDIR = $(PREFIX)/share/doc/opensysusers
+TESTDIR = /run/sysusers.d
 BINMODE = 0755
-CONFMODE = 0644
-DOCMODE = 0644
+MODE = 0644
 INSTALL = install
 MAKE = make
-SYSTEMDCOMPAT = TRUE
-ifeq ($(SYSTEMDCOMPAT),TRUE)
-	BINPROGS = systemd-sysusers
+
+HAVESYSTEMD = yes
+HAVEOPENRC = no
+HAVEMAN = yes
+
+LIBS = lib/common.sh
+INITD = openrc/opensysusers.initd
+
+ifeq ($(HAVESYSTEMD),yes)
+	BINPROGS = bin/sysusers
+	BINNAME = sysusers
 else
-	BINPROGS = opensysusers
+	BINPROGS = bin/opensysusers
+	BINNAME = opensysusers
 endif
 BINNAME = $(BINPROGS)
 
+TESTFILES = $(wildcard test/*.conf)
+
+all: $(BINPROGS)
+ifeq ($(HAVEOPENRC),yes)
+all: $(INITD)
+endif
+ifeq ($(HAVEMAN),yes)
 all:
-	+$(MAKE) INSTALL=$(INSTALL) DOCMODE=$(DOCMODE) MANDIR=$(MANDIR) DOCDIR=$(DOCDIR) PREFIX=$(PREFIX) DESTDIR=$(DESTDIR) -C man
-	sed -e "s|@BINFILE@|$(BINNAME)|" openrc/opensysusers.initd.in | tee openrc/opensysusers.initd 1> /dev/null
+	+$(MAKE) INSTALL=$(INSTALL) DOCMODE=$(MODE) MANDIR=$(MANDIR) DOCDIR=$(DOCDIR) DESTDIR=$(DESTDIR) -C man
+endif
+
+
+EDIT = sed -e "s|@LIBDIR[@]|$(LIBDIR)|" \
+	-e "s|@BINNAME[@]|$(BINNAME)|g" \
+	-e "s|@VERSION[@]|$(VERSION)|"
+
+RM = rm -f
+M4 = m4 -P
+CHMODAW = chmod a-w
+CHMODX = chmod +x
+
+%: %.in Makefile
+	@echo "GEN $@"
+	@$(RM) "$@"
+	@$(M4) $@.in | $(EDIT) >$@
+	@$(CHMODAW) "$@"
+	@$(CHMODX) "$@"
+
+clean-bin:
+	$(RM) $(BINPROGS)
+
+clean-openrc:
+	$(RM) $(INITD)
+
+clean-man:
+	+$(MAKE) INSTALL=$(INSTALL) DOCMODE=$(MODE) MANDIR=$(MANDIR) DOCDIR=$(DOCDIR) DESTDIR=$(DESTDIR) -C man clean
+
+clean: clean-bin
+ifeq ($(HAVEOPENRC),yes)
+clean: clean-openrc
+endif
+ifeq ($(HAVEMAN),yes)
+clean: clean-man
+endif
+
+install-shared:
+	$(INSTALL) -d $(DESTDIR)$(BINDIR)
+	$(INSTALL) -d $(DESTDIR)$(LIBDIR)/opensysusers
+	$(INSTALL) -m $(BINMODE) $(LIBS) $(DESTDIR)$(LIBDIR)/opensysusers
 
-clean:
-	+$(MAKE) INSTALL=$(INSTALL) DOCMODE=$(DOCMODE) MANDIR=$(MANDIR) DOCDIR=$(DOCDIR) PREFIX=$(PREFIX) DESTDIR=$(DESTDIR) -C man clean
+install-default-bin:
+	$(INSTALL) -m $(BINMODE) $(BINPROGS) $(DESTDIR)$(BINDIR)
 
-install:
-	$(INSTALL) -d $(DESTDIR)$(PREFIX)$(BINDIR)
-	$(INSTALL) -m $(BINMODE) $(BINPROGS) $(DESTDIR)$(PREFIX)$(BINDIR)/$(BINNAME)
-	$(INSTALL) -d $(DESTDIR)$(PREFIX)$(LIBDIR)/opensysusers
-	$(INSTALL) -m $(BINMODE) $(LIBS) $(DESTDIR)$(PREFIX)$(LIBDIR)/opensysusers
-	sed -e "s|@LIBDIR@|$(PREFIX)$(LIBDIR)|" -i $(DESTDIR)$(PREFIX)$(BINDIR)/$(BINNAME)
-	+$(MAKE) INSTALL=$(INSTALL) DOCMODE=$(DOCMODE) MANDIR=$(MANDIR) DOCDIR=$(DOCDIR) PREFIX=$(PREFIX) DESTDIR=$(DESTDIR) -C man install
+install-custom-bin:
+	$(INSTALL) -m $(BINMODE) $(BINPROGS) $(DESTDIR)$(BINDIR)/$(BINNAME)
+
+install-openrc:
+	$(INSTALL) -d $(DESTDIR)$(SYSCONFDIR)/{init.d,runlevels/boot}
+	$(INSTALL) -m $(BINMODE) $(INITD) $(DESTDIR)$(SYSCONFDIR)/init.d/opensysusers
+	ln -sf $(DESTDIR)$(SYSCONFDIR)/init.d/opensysusers $(DESTDIR)$(SYSCONFDIR)/runlevels/boot/
+
+install-man:
+	+$(MAKE) INSTALL=$(INSTALL) DOCMODE=$(MODE) MANDIR=$(MANDIR) DOCDIR=$(DOCDIR) DESTDIR=$(DESTDIR) -C man install
 
 install-tests:
-	$(INSTALL) -d $(DESTDIR)$(PREFIX)$(CONFDIR)
-	$(INSTALL) -m $(CONFMODE) $(CONFFILES) $(DESTDIR)$(PREFIX)$(CONFDIR)
+	$(INSTALL) -d $(DESTDIR)$(TESTDIR)
+	$(INSTALL) -m $(MODE) $(TESTFILES) $(DESTDIR)$(TESTDIR)
+
+uninstall-shared:
+	for lib in $(notdir ${LIBS}); do $(RM) $(DESTDIR)$(LIBDIR)/opensysusers/$$lib; done
+	$(RM)r --one-file-system $(DESTDIR)$(LIBDIR)/opensysusers
+
+uninstall-default-bin:
+	$(RM) $(DESTDIR)$(BINDIR)/$(notdir $(BINPROGS))
+
+uninstall-custom-bin:
+	$(RM) $(DESTDIR)$(BINDIR)/$(BINNAME)
+
+uninstall-openrc:
+	$(RM) $(DESTDIR)$(SYSCONFDIR)/init.d/opensysusers
+	$(RM) $(DESTDIR)$(SYSCONFDIR)/runlevels/boot/opensysusers
+
+uninstall-man:
+	+$(MAKE) INSTALL=$(INSTALL) DOCMODE=$(MODE) MANDIR=$(MANDIR) DOCDIR=$(DOCDIR) DESTDIR=$(DESTDIR) -C man uninstall
+
+ifeq ($(HAVESYSTEMD),yes)
+install: install-shared
+uninstall: uninstall-shared
+ifeq ($(HAVEMAN),yes)
+install: install-man
+uninstall: uninstall-man
+endif
+ifeq ($(BINNAME),sysusers)
+install: install-default-bin
+uninstall: uninstall-default-bin
+else
+install: install-custom-bin
+uninstall: uninstall-custom-bin
+endif
 
-uninstall:
-	for prog in ${BINPROGS}; do rm -f $(DESTDIR)$(PREFIX)$(BINDIR)/$$prog; done
-	for lib in ${LIBS}; do rm -f $(DESTDIR)$(PREFIX)$(LIBDIR)/opensysusers/$$lib; done
-	rm -rf --one-file-system $(DESTDIR)$(PREFIX)$(LIBDIR)/opensysusers
-	+$(MAKE) INSTALL=$(INSTALL) DOCMODE=$(DOCMODE) MANDIR=$(MANDIR) DOCDIR=$(DOCDIR) PREFIX=$(PREFIX) DESTDIR=$(DESTDIR) -C man uninstall
-	rm -f $(DESTDIR)$(PREFIX)$(BINDIR)/$(BINNAME)
+ifeq ($(HAVEOPENRC),yes)
+install: install-openrc
+uninstall: uninstall-openrc
+endif
+
+else
+install: install-shared install-default-bin
+uninstall: uninstall-shared uninstall-default-bin
+ifeq ($(HAVEMAN),yes)
+install: install-man
+uninstall: uninstall-man
+endif
+ifeq ($(HAVEOPENRC),yes)
+install: install-openrc
+uninstall: uninstall-openrc
+endif
+
+endif
 
-.PHONY: all install install-tests uninstal
+.PHONY: all install install-custom-bin install-default-bin install-man install-openrc install-shared install-tests uninstall uninstall-custom-bin uninstall-default-bin uninstall-man uninstall-openrc uninstall-shared clean clean-bin clean-man clean-openrc

opensysusers bin/opensysusers.inopensysusers renamed to bin/opensysusers.in

@@ -4,6 +4,8 @@
 #
 # This is an implementation of sysusers.d spec without systemd command
 
+sysusersver=@VERSION@
+
 source @LIBDIR@/opensysusers/common.sh
 
 get_conf_files

systemd-sysusers bin/sysusers.insystemd-sysusers renamed to bin/sysusers.in

@@ -4,13 +4,15 @@
 #
 # This is an implementation of the systemd-sysusers command
 
+sysusersver=@VERSION@
+
 usage() {
-	printf "systemd-sysusers\n\n"
+	printf "@BINNAME@\n\n"
 
-	printf "systemd-sysusers creates system users and groups, based on the file\n"
+	printf "@BINNAME@ creates system users and groups, based on the file\n"
     printf "format and location specified in sysusers.d(5).\n\n"
 
-	printf "Usage: /usr/bin/systemd-sysusers [OPTIONS...] [CONFIGFILE...]\n\n"
+	printf "Usage: /usr/bin/@BINNAME@ [OPTIONS...] [CONFIGFILE...]\n\n"
 
 	printf "Options:\n"
 	printf "  --root=root               All paths will be prefixed with the\n"
@@ -24,7 +26,7 @@ usage() {
 	printf "  --version                 Print a short version string and exit.\n"
 }
 
-TEMP=$(getopt -o "h" -l "root:,replace:,inline,help,version" -n "systemd-sysusers" -- "$@")
+TEMP=$(getopt -o "h" -l "root:,replace:,inline,help,version" -n "@BINNAME@" -- "$@")
 if [ $? -ne 0 ]; then
 	usage
 	exit 1;

common.sh lib/common.shcommon.sh renamed to lib/common.sh

@@ -88,6 +88,7 @@ parse_file() {
 	local file="${1}"
 	if [ -f ${file} ]; then
 		while read cline; do
+			[[ "${cline}" =~ ^#.*$ ]] && continue
 			parse_string "${cline}"
 		done < ${file}
 	fi
@@ -188,4 +189,3 @@ sysusers_d=''
 replace=''
 
 sysusers_dirs="${root}/usr/lib/sysusers.d ${root}/run/sysusers.d ${root}/etc/sysusers.d"
-sysusersver='0.4.5'

man/Makefile

@@ -23,16 +23,16 @@ clean:
 	rm $(docfiles)
 
 install:
-	$(INSTALL) -d $(DESTDIR)$(PREFIX)$(MANDIR)/man{5,8}
-	$(INSTALL) -m $(DOCMODE) $(manfiles5) $(DESTDIR)$(PREFIX)$(MANDIR)/man5
-	$(INSTALL) -m $(DOCMODE) $(manfiles8) $(DESTDIR)$(PREFIX)$(MANDIR)/man8
-	$(INSTALL) -d $(DESTDIR)$(PREFIX)$(DOCDIR)
-	$(INSTALL) -m $(DOCMODE) $(docfiles) $(DESTDIR)$(PREFIX)$(DOCDIR)
+	$(INSTALL) -d $(DESTDIR)$(MANDIR)/man{5,8}
+	$(INSTALL) -m $(DOCMODE) $(manfiles5) $(DESTDIR)$(MANDIR)/man5
+	$(INSTALL) -m $(DOCMODE) $(manfiles8) $(DESTDIR)$(MANDIR)/man8
+	$(INSTALL) -d $(DESTDIR)$(DOCDIR)
+	$(INSTALL) -m $(DOCMODE) $(docfiles) $(DESTDIR)$(DOCDIR)
 
 uninstall:
-	for man in ${manfiles5}; do rm -f $(DESTDIR)$(PREFIX)$(MANDIR)/man5/$$man; done
-	for man in ${manfiles8}; do rm -f $(DESTDIR)$(PREFIX)$(MANDIR)/man8/$$man; done
-	for doc in ${docfiles}; do rm -f $(DESTDIR)$(PREFIX)$(DOCDIR)/$$doc; done
-	rm -rf --one-file-system $(DESTDIR)$(PREFIX)$(DOCDIR)
+	for man in ${manfiles5}; do rm -f $(DESTDIR)$(MANDIR)/man5/$$man; done
+	for man in ${manfiles8}; do rm -f $(DESTDIR)$(MANDIR)/man8/$$man; done
+	for doc in ${docfiles}; do rm -f $(DESTDIR)$(DOCDIR)/$$doc; done
+	rm -rf --one-file-system $(DESTDIR)$(DOCDIR)
 
 .PHONY: all install clean

openrc/opensysusers.initd.in

@@ -12,6 +12,6 @@ depend()
 start()
 {
 	ebegin "Setting up sysusers.d entries"
-	@BINFILE@
+	@BINNAME@
 	eend $?
 }