wok diff glpi/receipt @ rev 20832

dhcp: race condition
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Feb 19 19:00:06 2019 +0100 (2019-02-19)
parents 1067bb7f1e24
children af4467247c61
line diff
     1.1 --- a/glpi/receipt	Wed Dec 16 15:49:50 2015 +0100
     1.2 +++ b/glpi/receipt	Tue Feb 19 19:00:06 2019 +0100
     1.3 @@ -62,9 +62,9 @@
     1.4  post_install()
     1.5  {
     1.6  	# Configure apache server
     1.7 -	if [ -f $1/etc/apache/httpd.conf ]; then
     1.8 -		if [ ! -f $1/etc/apache/conf.d/glpi ]; then
     1.9 -			cat > $1/etc/apache/conf.d/glpi <<EOT
    1.10 +	if [ -f "$1/etc/apache/httpd.conf" ]; then
    1.11 +		if [ ! -f "$1/etc/apache/conf.d/glpi" ]; then
    1.12 +			cat > "$1/etc/apache/conf.d/glpi" <<EOT
    1.13  <IfModule mod_alias.c>
    1.14      Alias /glpi /usr/share/glpi/
    1.15  </IfModule>
    1.16 @@ -109,7 +109,7 @@
    1.17  	fi
    1.18  
    1.19  	# Configure every thing for glpi.
    1.20 -	if [ -z $1 ]; then
    1.21 +	if [ -z "$1" ]; then
    1.22  		if ( ! mysqladmin -s ping > /dev/null ); then
    1.23  			echo "Starting MySQL server"
    1.24  			( /etc/init.d/mysql start ; status  ) || exit 
    1.25 @@ -157,4 +157,3 @@
    1.26  		esac
    1.27  	
    1.28  }
    1.29 -