SliTaz Repositories

     1.1 --- a/glpi/receipt	Sat Jul 11 12:00:11 2009 +0200
     1.2 +++ b/glpi/receipt	Sat Jul 11 12:01:12 2009 +0200
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="glpi"
     1.7 -VERSION="0.71.5"
     1.8 +VERSION="0.71.6"
     1.9  CATEGORY="network"
    1.10  SHORT_DESC="IT and Asset Management."
    1.11  MAINTAINER="erjo@slitaz.org"
    1.12 @@ -36,17 +36,6 @@
    1.13  
    1.14  post_install()
    1.15  {
    1.16 -	# Configure lighttpd server
    1.17 -	if [ -f $1/etc/lighttpd/lighttpd.conf ]; then
    1.18 -		if ! grep -q /usr/share/glpi/ $1/etc/lighttpd/lighttpd.conf; then
    1.19 -	    		sed -e 's|.*"/examples/" => "/usr/share/examples/",|    "/examples/" => "/usr/share/examples/",\n    "/glpi/" => "/usr/share/glpi/",|g' -i $1/etc/lighttpd/lighttpd.conf
    1.20 -			if [ -z "$1" ]; then
    1.21 -				# Start Web server.
    1.22 -				/etc/init.d/lighttpd stop
    1.23 -				/etc/init.d/lighttpd start
    1.24 -			fi
    1.25 -		fi
    1.26 -	fi
    1.27  	# Configure apache server
    1.28  	if [ -f $1/etc/apache/httpd.conf ]; then
    1.29  		if [ ! -f $1/etc/apache/conf.d/glpi ]; then
    1.30 @@ -77,7 +66,7 @@
    1.31  			( /etc/init.d/mysql start ; status  ) || exit 
    1.32  			sleep 4 #let the mysql daemon start
    1.33  		fi
    1.34 -		if ( ! mysql -Be 'show databases' | grep -q glpi ); then
    1.35 +		if ( ! mysql -u root -Be 'show databases' | grep -q glpi ); then
    1.36  			echo -n "Create Glpi database"
    1.37  			mysql -Be "create database glpi" ; status
    1.38  			# We suppose that glpi user does not exist.
    1.39 @@ -103,13 +92,13 @@
    1.40  		y|Y)
    1.41  			echo -n "Removing data directories..."
    1.42  			rm -rf /var/lib/glpi ; status
    1.43 -			if ( ! mysql -Be 'show databases' | grep -q glpi ); then
    1.44 +			if ( mysql -u root -Be 'show databases' | grep -q glpi ); then
    1.45  				echo -n "Deleting Glpi database"
    1.46  				mysql -Be "drop database glpi" ; status
    1.47  				# We suppose that glpi user does not exist.
    1.48  				# It may be false.
    1.49  				echo  -n "Delete user glpi"
    1.50 -				mysql -Be "delete from mysql.db where user=glpi" ; status
    1.51 +				mysql -Be "delete from mysql.db where user='glpi'" ; status
    1.52  			fi
    1.53  			unset $answer
    1.54  			;;