wok diff phpmyadmin/receipt @ rev 20257

Add giflossy
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Mar 13 23:27:32 2018 +0100 (2018-03-13)
parents d51b2411e55e
children a78610b2eb47
line diff
     1.1 --- a/phpmyadmin/receipt	Sat Apr 05 10:12:34 2014 +0000
     1.2 +++ b/phpmyadmin/receipt	Tue Mar 13 23:27:32 2018 +0100
     1.3 @@ -47,11 +47,11 @@
     1.4  {
     1.5  	secret=$(dd if=/dev/urandom count=1 2> /dev/null | md5sum | sed 's/ .*//')
     1.6  	sed -i "s/^\(.*blowfish_secret'] = '\)'/\1$secret'/" \
     1.7 -		$1/etc/phpmyadmin/config.inc.php
     1.8 +		"$1/etc/phpmyadmin/config.inc.php"
     1.9  	# Configure lighttpd server
    1.10 -	if [ -f $1/etc/lighttpd/lighttpd.conf ]; then
    1.11 -		if ! grep -q /usr/share/phpmyadmin/ $1/etc/lighttpd/lighttpd.conf; then
    1.12 -	    		sed -e 's|.*"/examples/" => "/usr/share/examples/",|    "/examples/" => "/usr/share/examples/",\n    "/phpmyadmin/" => "/usr/share/phpmyadmin/",|g' -i $1/etc/lighttpd/lighttpd.conf
    1.13 +	if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then
    1.14 +		if ! grep -q /usr/share/phpmyadmin/ "$1/etc/lighttpd/lighttpd.conf"; then
    1.15 +	    		sed -e 's|.*"/examples/" => "/usr/share/examples/",|    "/examples/" => "/usr/share/examples/",\n    "/phpmyadmin/" => "/usr/share/phpmyadmin/",|g' -i "$1/etc/lighttpd/lighttpd.conf"
    1.16  			if [ -z "$1" ]; then
    1.17  				# Start Web server.
    1.18  				/etc/init.d/lighttpd stop
    1.19 @@ -60,9 +60,9 @@
    1.20  		fi
    1.21  	fi
    1.22  	# Configure apache server
    1.23 -	if [ -f $1/etc/apache/httpd.conf ]; then
    1.24 -		if [ ! -f $1/etc/apache/conf.d/phpmyadmin ]; then
    1.25 -			cat > $1/etc/apache/conf.d/phpmyadmin <<EOT
    1.26 +	if [ -f "$1/etc/apache/httpd.conf" ]; then
    1.27 +		if [ ! -f "$1/etc/apache/conf.d/phpmyadmin" ]; then
    1.28 +			cat > "$1/etc/apache/conf.d/phpmyadmin" <<EOT
    1.29  <IfModule mod_alias.c>
    1.30      Alias /phpmyadmin /usr/share/phpmyadmin
    1.31  </IfModule>