[asterisk-commits] pabelanger: branch pabelanger/non-root r278707 - in /team/pabelanger/non-root...

[SVN commits to the Asterisk project]

Author: pabelanger
Date: Thu Jul 22 14:43:16 2010
New Revision: 278707

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=278707
Log:
Add quiet option to adduser and addgroup.

Correct problem with logic when checking if user/group exists.

Don't create man8 directory; clean-up installdirs.

Export AST_USER_EXIST / AST_GROUP_EXIST for pre_install.


Modified:
    team/pabelanger/non-root/Makefile
    team/pabelanger/non-root/build_tools/pre_install
    team/pabelanger/non-root/configure

Modified: team/pabelanger/non-root/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/non-root/Makefile?view=diff&rev=278707&r1=278706&r2=278707
==============================================================================
--- team/pabelanger/non-root/Makefile (original)
+++ team/pabelanger/non-root/Makefile Thu Jul 22 14:43:16 2010
@@ -89,7 +89,9 @@
 export MD5
 export WGET_EXTRA_ARGS
 export AST_USER
+export AST_USER_EXIST
 export AST_GROUP
+export AST_GROUP_EXIST
 export AST_ENABLE_ROOT
 
 # even though we could use '-include makeopts' here, use a wildcard
@@ -589,12 +591,12 @@
 	$(INSTALL) -d -m 750 $(DESTDIR)$(ASTDATADIR)
 	$(INSTALL) -d -m 750 $(DESTDIR)$(ASTDATADIR)/documentation
 	$(INSTALL) -d -m 750 $(DESTDIR)$(ASTDATADIR)/documentation/thirdparty
-	$(INSTALL) -d -m 750 $(DESTDIR)$(ASTDATADIR)/keys
 	$(INSTALL) -d -m 750 $(DESTDIR)$(ASTDATADIR)/firmware
 	$(INSTALL) -d -m 750 $(DESTDIR)$(ASTDATADIR)/firmware/iax
-	$(INSTALL) -d -m 750 $(DESTDIR)$(ASTMANDIR)/man8
+	$(INSTALL) -d -m 750 $(DESTDIR)$(ASTDATADIR)/images
+	$(INSTALL) -d -m 750 $(DESTDIR)$(ASTDATADIR)/keys
+	$(INSTALL) -d -m 750 $(DESTDIR)$(ASTDATADIR)/phoneprov
 	$(INSTALL) -d -m 750 $(DESTDIR)$(ASTDATADIR)/static-http
-	$(INSTALL) -d -m 750 $(DESTDIR)$(ASTDATADIR)/images
 	$(INSTALL) -d -m 750 $(DESTDIR)$(AGI_DIR)
 
 bininstall: _all installdirs $(SUBDIRS_INSTALL)
@@ -651,10 +653,10 @@
 	fi
 
 preinstall:
-	build_tools/pre_install
+	@build_tools/pre_install
 
 postinstall:
-	build_tools/post_install
+	@build_tools/post_install
 
 badshell:
 ifneq ($(findstring ~,$(DESTDIR)),)
@@ -758,8 +760,8 @@
 		rm -f $(DESTDIR)$(ASTCONFPATH).tmp ; \
 	fi ; \
 	$(INSTALL) -d -m 750 $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
-	build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR)
-	$(INSTALL) -d -m 750 $(DESTDIR)$(ASTDATADIR)/phoneprov
+	build_tools/make_sample_voicemail $(DESTDIR)$(ASTDATADIR) $(DESTDIR)$(ASTSPOOLDIR)
+
 	@for x in phoneprov/*; do \
 		dst="$(DESTDIR)$(ASTDATADIR)/$$x" ;	\
 		if [ -f $${dst} ]; then \

Modified: team/pabelanger/non-root/build_tools/pre_install
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/non-root/build_tools/pre_install?view=diff&rev=278707&r1=278706&r2=278707
==============================================================================
--- team/pabelanger/non-root/build_tools/pre_install (original)
+++ team/pabelanger/non-root/build_tools/pre_install Thu Jul 22 14:43:16 2010
@@ -14,14 +14,14 @@
 
 handle_debian() {
 	# Check if group exists
-	if [ "x$AST_GROUP_EXIST" != "xyes" ] ; then
+	if [ "x$AST_GROUP_EXIST" = "xno" ] ; then
 		echo 'Adding system group for Asterisk'
-		addgroup --system $AST_GROUP
+		addgroup --quiet --system $AST_GROUP
 	fi
 
-	if [ "x$AST_USER_EXIST" != "xyes" ] ; then
+	if [ "x$AST_USER_EXIST" = "xno" ] ; then
 		echo 'Adding system user for Asterisk'
-		adduser --system --ingroup $AST_GROUP --home $ASTVARLIBDIR \
+		adduser --quiet --system --ingroup $AST_GROUP --home $ASTVARLIBDIR \
 			--disabled-login --gecos "Asterisk PBX daemon" $AST_USER
 	fi
 }