From 6554fde40d466cf509e343fea4842d7154c0dee4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 7 Oct 2008 23:04:12 +0000
Subject: [PATCH] Update scripts for live CD.

---
 dev/initdemo/initdemo.sh   | 19 ++++++++++++-------
 dev/initdemo/removedemo.sh | 10 +++++++++-
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/dev/initdemo/initdemo.sh b/dev/initdemo/initdemo.sh
index 20be642c8be..f0a190d32c6 100644
--- a/dev/initdemo/initdemo.sh
+++ b/dev/initdemo/initdemo.sh
@@ -9,11 +9,13 @@
 # WARNING: This script erase all data of database
 #------------------------------------------------------
 
+export mydir=`echo "$_" | sed -e 's/initdemo.sh//'`;
+
 DIALOG=${DIALOG=dialog}
 DIALOG="$DIALOG --ascii-lines"
 fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
 trap "rm -f $fichtemp" 0 1 2 5 15
-$DIALOG --title "Reload Dolibarr database" --clear \
+$DIALOG --title "Init Dolibarr with demo values" --clear \
         --inputbox "Mysql database name :" 16 51 dolibarrdemo 2> $fichtemp
 valret=$?
 case $valret in
@@ -28,8 +30,8 @@ esac
 DIALOG=${DIALOG=dialog}
 fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
 trap "rm -f $fichtemp" 0 1 2 5 15
-$DIALOG --title "Purge de Dolibarr" --clear \
-        --inputbox "Mysql usr login (ex: root):" 16 51 2> $fichtemp
+$DIALOG --title "Init Dolibarr with demo values" --clear \
+        --inputbox "Mysql user login (ex: root):" 16 51 2> $fichtemp
 
 valret=$?
 
@@ -45,8 +47,8 @@ esac
 DIALOG=${DIALOG=dialog}
 fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
 trap "rm -f $fichtemp" 0 1 2 5 15
-$DIALOG --title "Purge de Dolibarr" --clear \
-        --inputbox "Password for Mysql user admin :" 16 51 2> $fichtemp
+$DIALOG --title "Init Dolibarr with demo values" --clear \
+        --inputbox "Password for Mysql user login :" 16 51 2> $fichtemp
 
 valret=$?
 
@@ -62,7 +64,7 @@ esac
 DIALOG=${DIALOG=dialog}
 fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
 trap "rm -f $fichtemp" 0 1 2 5 15
-$DIALOG --title "Purge de Dolibarr" --clear \
+$DIALOG --title "Init Dolibarr with demo values" --clear \
         --inputbox "Full path to documents directory (ex: /var/www/dolibarr/documents)- no / at end :" 16 51 2> $fichtemp
 
 valret=$?
@@ -87,4 +89,7 @@ case $? in
 esac
 
 # ---------------------------- run sql file
-mysql -u$admin -p$passwd $base < initdemo.sql
+mysql -u$admin -p$passwd $base < $mydir/initdemo.sql
+
+echo "Dolibarr data demo has been loaded."
+echo
diff --git a/dev/initdemo/removedemo.sh b/dev/initdemo/removedemo.sh
index 0969426a3c2..d4201346e7a 100644
--- a/dev/initdemo/removedemo.sh
+++ b/dev/initdemo/removedemo.sh
@@ -9,6 +9,8 @@
 # WARNING: This script erase all data of database
 #------------------------------------------------------
 
+export mydir=`echo "$_" | sed -e 's/removedemo.sh//'`;
+
 DIALOG=${DIALOG=dialog}
 DIALOG="$DIALOG --ascii-lines"
 fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
@@ -26,4 +28,10 @@ exit;;
 esac
 
 # ---------------------------- remove conf file
-rm ../../htdocs/conf/conf.php
+echo "Remove file $mydir../../htdocs/conf/conf.php"
+rm $mydir../../htdocs/conf/conf.php 2>/dev/null
+echo "Remove file $mydir../../install.lock"
+rm $mydir../../install.lock 2>/dev/null
+
+echo "Dolibarr demo has been removed (need to be installed again)."
+echo