wok diff apache/receipt @ rev 18713

Translations for Science category (thanks Aleksej)
author Lucas Levrel <llevrel@yahoo.fr>
date Wed Dec 16 20:44:08 2015 +0100 (2015-12-16)
parents fb5d18e72609
children 16d87ac5f8c3
line diff
     1.1 --- a/apache/receipt	Fri Nov 13 11:06:53 2015 +0100
     1.2 +++ b/apache/receipt	Wed Dec 16 20:44:08 2015 +0100
     1.3 @@ -70,7 +70,6 @@
     1.4  # We stop the server by default in case of upgarde.
     1.5  pre_install()
     1.6  {
     1.7 -	echo "Processing pre-install commands..."
     1.8  	[ -z "$1" ] && [ -f /etc/init.d/$PACKAGE ] && /etc/init.d/$PACKAGE stop
     1.9  }
    1.10  
    1.11 @@ -79,7 +78,7 @@
    1.12  	local lang=$(. /etc/locale.conf 2>/dev/null; echo ${LANG#*_})
    1.13  	local tz=$(cat /etc/TZ 2>/dev/null)
    1.14  	local hostname=$(cat /etc/hostname 2>/dev/null)
    1.15 -	echo "Processing post-install commands..."
    1.16 +
    1.17  	# Just in case.
    1.18  	chown www.www $1/var/log/$PACKAGE
    1.19  	ping -c 2 $(hostname) > /dev/null 2>&1 || 
    1.20 @@ -95,11 +94,12 @@
    1.21  
    1.22  
    1.23  EOT
    1.24 +	[ -z "$quiet" ] && echo # Start new line
    1.25  	( cd $1/$INSTALLED/ ; grep -l /etc/apache/conf.d/ */receipt ) | \
    1.26  	while read file; do
    1.27  		pkg=$(dirname $file)
    1.28  		[ "$pkg" = "$PACKAGE" ] && continue
    1.29 -		echo "Reconfiguring $pkg for $PACKAGE..."
    1.30 +		[ -z "$quiet" ] && echo "Reconfiguring $pkg for $PACKAGE..."
    1.31  		tazpkg reconfigure $pkg
    1.32  	done
    1.33  	[ -f $1/etc/php.ini ] && tazpkg get-install php-apache --root=$1