wok-6.x diff squirrelmail/receipt @ rev 20248

Up alsa (1.1.5) again
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Mar 12 15:28:31 2018 +0100 (2018-03-12)
parents d51b2411e55e
children 46dcc80bef41
line diff
     1.1 --- a/squirrelmail/receipt	Sat Apr 05 10:12:34 2014 +0000
     1.2 +++ b/squirrelmail/receipt	Mon Mar 12 15:28:31 2018 +0100
     1.3 @@ -51,9 +51,9 @@
     1.4  {
     1.5  	#echo "Update /short_open_tag in /etc/php.ini"
     1.6  	#sed -i 's/^short_open_tag.*/short_open_tag = On/' /etc/php.ini
     1.7 -	if [ -f $1/etc/lighttpd/lighttpd.conf ]; then
     1.8 -		if ! grep -q /usr/share/squirrelmail/ $1/etc/lighttpd/lighttpd.conf; then
     1.9 -	    		sed -e 's|.*"/examples/" => "/usr/share/examples/",|    "/examples/" => "/usr/share/examples/",\n    "/squirrelmail/" => "/usr/share/squirrelmail/",|g' -i $1/etc/lighttpd/lighttpd.conf
    1.10 +	if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then
    1.11 +		if ! grep -q /usr/share/squirrelmail/ "$1/etc/lighttpd/lighttpd.conf"; then
    1.12 +	    		sed -e 's|.*"/examples/" => "/usr/share/examples/",|    "/examples/" => "/usr/share/examples/",\n    "/squirrelmail/" => "/usr/share/squirrelmail/",|g' -i "$1/etc/lighttpd/lighttpd.conf"
    1.13  			if [ -z "$1" ]; then
    1.14  				# Start Web server.
    1.15  				/etc/init.d/lighttpd stop
    1.16 @@ -62,9 +62,9 @@
    1.17  		fi
    1.18  	fi
    1.19  	# Configure apache server
    1.20 -	if [ -f $1/etc/apache/httpd.conf ]; then
    1.21 -		if [ ! -f $1/etc/apache/conf.d/squirrelmail ]; then
    1.22 -			cat > $1/etc/apache/conf.d/squirrelmail <<EOT
    1.23 +	if [ -f "$1/etc/apache/httpd.conf" ]; then
    1.24 +		if [ ! -f "$1/etc/apache/conf.d/squirrelmail" ]; then
    1.25 +			cat > "$1/etc/apache/conf.d/squirrelmail" <<EOT
    1.26  <IfModule mod_alias.c>
    1.27      Alias /squirrelmail /usr/share/squirrelmail
    1.28  </IfModule>