SliTaz Repositories

     1.1 --- a/apache/receipt	Wed Dec 16 23:00:12 2015 +0100
     1.2 +++ b/apache/receipt	Sat Jan 09 18:56:52 2016 +0100
     1.3 @@ -80,12 +80,12 @@
     1.4  	local hostname=$(cat /etc/hostname 2>/dev/null)
     1.5  
     1.6  	# Just in case.
     1.7 -	chown www.www $1/var/log/$PACKAGE
     1.8 +	chown www.www "$1/var/log/$PACKAGE"
     1.9  	ping -c 2 $(hostname) > /dev/null 2>&1 || 
    1.10 -		sed -i "s/localhost/$(hostname) localhost/" $1/etc/hosts
    1.11 -	[ -s $1/etc/ssl/apache/apache.pem ] ||
    1.12 -	openssl req -new -x509 -keyout $1/etc/ssl/apache/apache.pem \
    1.13 -		-out $1/etc/ssl/apache/apache.pem -days 3650 -nodes <<EOT
    1.14 +		sed -i "s/localhost/$(hostname) localhost/" "$1/etc/hosts"
    1.15 +	[ -s "$1/etc/ssl/apache/apache.pem" ] ||
    1.16 +	openssl req -new -x509 -keyout "$1/etc/ssl/apache/apache.pem" \
    1.17 +		-out "$1/etc/ssl/apache/apache.pem" -days 3650 -nodes <<EOT
    1.18  ${lang:-us}
    1.19  ${tz:-UTC}
    1.20  
    1.21 @@ -95,14 +95,14 @@
    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 +	( cd "$1/$INSTALLED/" ; grep -l /etc/apache/conf.d/ */receipt ) | \
    1.27  	while read file; do
    1.28  		pkg=$(dirname $file)
    1.29  		[ "$pkg" = "$PACKAGE" ] && continue
    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
    1.34 +	[ -f "$1/etc/php.ini" ] && tazpkg get-install php-apache --root="$1"
    1.35  	[ "$1" ] || netstat -ltn 2> /dev/null | grep -q :80 ||
    1.36  	/etc/init.d/$PACKAGE start
    1.37  }