[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gsrc-commit] trunk r2616: utilize user/group dependency checking
From: |
Brandon Invergo |
Subject: |
[Gsrc-commit] trunk r2616: utilize user/group dependency checking |
Date: |
Mon, 28 Oct 2013 21:50:34 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 2616
revision-id: address@hidden
parent: address@hidden
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Mon 2013-10-28 22:27:47 +0100
message:
utilize user/group dependency checking
modified:
gar.lib.mk gar.lib.mk-20100602191336-d3df1ggfm1r56woa-4
gar.mk gar.mk-20100602191336-d3df1ggfm1r56woa-6
=== modified file 'gar.lib.mk'
--- a/gar.lib.mk 2013-04-09 21:01:15 +0000
+++ b/gar.lib.mk 2013-10-28 21:27:47 +0000
@@ -896,16 +896,24 @@
NEED_USERS ?=
NEED_GROUPS ?=
-depcheck-users:
+checkdep-users:
set -e; for user in $(NEED_USERS) -; do \
[ "$$user" = "-" ] && continue; \
- printf "[$(OK)depcheck-users$(OFF)] $(MSG)Checking user\n"
$$user "exists"; \
- $(PYTHON) -c "import pwd; pwd.getpwnam('$$user')" 2>/dev/null; \
+ printf "[$(OK)checkdep-users$(OFF)] $(MSG)Checking if user %s
exists$(OFF)\n" $$user; \
+ $(PYTHON) -c "import pwd; pwd.getpwnam('$$user')" 2>/dev/null
|| \
+ printf "[$(ERR)checkdep-users$(OFF)] $(MSG)User $$user
is required \
+to run this program.\nPlease create the the user or check if the program \
+supports changing the \nrequired user.$(OFF)\n" && exit 1; \
done $(OUTPUT)
+
+checkdep-groups:
set -e; for group in $(NEED_GROUPS) -; do \
[ "$$group" = "-" ] && continue; \
- printf "[$(OK)depcheck-users$(OFF)] $(MSG)Checking group\n"
$$group "exists"; \
- $(PYTHON) -c "import grp; grp.getgrnam('$$group')" 2>/dev/null;
\
+ printf "[$(OK)checkdep-groups(OFF)] $(MSG)Checking if group %s
exists$(OFF)\n" $$group; \
+ $(PYTHON) -c "import grp; grp.getgrnam('$$group')" 2>/dev/null
|| \
+ printf "[$(ERR)checkdep-groups(OFF)] $(MSG)Group
$$group is required to \
+run this program.\nPlease create the the group or check if the program
supports \
+changing the \nrequired group.$(OFF)\n" && exit 1; \
done $(OUTPUT)
$(MAKECOOKIE)
=== modified file 'gar.mk'
--- a/gar.mk 2013-10-28 20:26:54 +0000
+++ b/gar.mk 2013-10-28 21:27:47 +0000
@@ -316,14 +316,16 @@
reinstall: $(addprefix dep-$(GARDIR)/,$(LIBDEPS)) $(addprefix
sysinstall-,$(filter-out $(SYSINSTALL_IGNORE),$(SYSINSTALL_TARGETS)))
install-src: extract
- printf "[$(OK)install-src$(OK)] $(MSG)Installing
$(GARNAME)-$(GARVERSION) source code$(OFF)\n"
+ @printf "[$(OK)install-src$(OK)] $(MSG)Installing
$(GARNAME)-$(GARVERSION) source code$(OFF)\n"
mkdir -p $(SRCDIR)/$(GARNAME)-$(GARVERSION)
cp -r $(WORKSRC)/* $(SRCDIR)/$(GARNAME)-$(GARVERSION)
+ $(MAKECOOKIE)
uninstall-src:
- printf "[$(OK)uninstall-src$(OK)] $(MSG)Uninstalling
$(GARNAME)-$(GARVERSION) source code$(OFF)\n"
+ @printf "[$(OK)uninstall-src$(OK)] $(MSG)Uninstalling
$(GARNAME)-$(GARVERSION) source code$(OFF)\n"
[[ -d $(SRCDIR)/$(GARNAME)-$(GARVERSION) ]] && \
rm -rvf $(SRCDIR)/$(GARNAME)-$(GARVERSION)
+ $(MAKECOOKIE)
# uninstall - Remove the installation.
uninstall: sysinstall-uninstall
@@ -361,7 +363,7 @@
dep-list:
@echo $(DEPS)
-checkdeps: $(addprefix checkdep-$(GARDIR)/,$(LIBDEPS) $(BUILDDEPS) $(if
$(USE_TESTS),$(TESTDEPS),) $(INSTALLDEPS))
+checkdeps: $(addprefix checkdep-$(GARDIR)/,$(LIBDEPS) $(BUILDDEPS) $(if
$(USE_TESTS),$(TESTDEPS),) $(INSTALLDEPS)) checkdep-users checkdep-groups
$(DONADA)
checkdep-$(GARDIR)/%:
@@ -379,7 +381,7 @@
rm -rf $(DOWNLOADDIR) $(COOKIEDIR) $(LOGDIR) $(WORKSRC) $(WORKDIR)
$(EXTRACTDIR) $(SCRATCHDIR) $(SCRATCHDIR)-$(COOKIEDIR) *~
# these targets do not have actual corresponding files
-.PHONY: all info fetch-list fetch checksum makesum garchive extract patch
makepatch configure build test install clean beaujolais update help
+.PHONY: all info fetch-list fetch checksum makesum garchive extract patch
makepatch configure build test install clean beaujolais update help install-src
uninstall-src
# A logging version of the rules, e.g. make build-log, respawns and sends
output to $(LOGDIR)
%-log: $(LOGDIR)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gsrc-commit] trunk r2616: utilize user/group dependency checking,
Brandon Invergo <=