# HG changeset patch
# User Eric Joseph-Alexandre <erjo@slitaz.org>
# Date 1247306472 -7200
# Node ID 90b9bfd8dfb00eb763f1da92a92783f114a2b16c
# Parent  9bba2e65be4d450a547eccdfa352bd124557c124
Up and fix glpi (0.71.6)

diff -r 9bba2e65be4d -r 90b9bfd8dfb0 glpi/receipt
--- a/glpi/receipt	Sat Jul 11 12:00:11 2009 +0200
+++ b/glpi/receipt	Sat Jul 11 12:01:12 2009 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="glpi"
-VERSION="0.71.5"
+VERSION="0.71.6"
 CATEGORY="network"
 SHORT_DESC="IT and Asset Management."
 MAINTAINER="erjo@slitaz.org"
@@ -36,17 +36,6 @@
 
 post_install()
 {
-	# Configure lighttpd server
-	if [ -f $1/etc/lighttpd/lighttpd.conf ]; then
-		if ! grep -q /usr/share/glpi/ $1/etc/lighttpd/lighttpd.conf; then
-	    		sed -e 's|.*"/examples/" => "/usr/share/examples/",|    "/examples/" => "/usr/share/examples/",\n    "/glpi/" => "/usr/share/glpi/",|g' -i $1/etc/lighttpd/lighttpd.conf
-			if [ -z "$1" ]; then
-				# Start Web server.
-				/etc/init.d/lighttpd stop
-				/etc/init.d/lighttpd start
-			fi
-		fi
-	fi
 	# Configure apache server
 	if [ -f $1/etc/apache/httpd.conf ]; then
 		if [ ! -f $1/etc/apache/conf.d/glpi ]; then
@@ -77,7 +66,7 @@
 			( /etc/init.d/mysql start ; status  ) || exit 
 			sleep 4 #let the mysql daemon start
 		fi
-		if ( ! mysql -Be 'show databases' | grep -q glpi ); then
+		if ( ! mysql -u root -Be 'show databases' | grep -q glpi ); then
 			echo -n "Create Glpi database"
 			mysql -Be "create database glpi" ; status
 			# We suppose that glpi user does not exist.
@@ -103,13 +92,13 @@
 		y|Y)
 			echo -n "Removing data directories..."
 			rm -rf /var/lib/glpi ; status
-			if ( ! mysql -Be 'show databases' | grep -q glpi ); then
+			if ( mysql -u root -Be 'show databases' | grep -q glpi ); then
 				echo -n "Deleting Glpi database"
 				mysql -Be "drop database glpi" ; status
 				# We suppose that glpi user does not exist.
 				# It may be false.
 				echo  -n "Delete user glpi"
-				mysql -Be "delete from mysql.db where user=glpi" ; status
+				mysql -Be "delete from mysql.db where user='glpi'" ; status
 			fi
 			unset $answer
 			;;