From 2314b70b6ad43f3516dd022636ec8beeb8e8da68 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 28 Dec 2008 05:22:00 +0000
Subject: [PATCH] Fix: Minor fix in install tools

---
 dev/initdemo/initdemo.sh   | 44 ++++++++++++++++++++++++++++++++++----
 dev/initdemo/removedemo.sh |  1 +
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/dev/initdemo/initdemo.sh b/dev/initdemo/initdemo.sh
index f0a190d32c6..5f6509c8592 100644
--- a/dev/initdemo/initdemo.sh
+++ b/dev/initdemo/initdemo.sh
@@ -10,7 +10,16 @@
 #------------------------------------------------------
 
 export mydir=`echo "$_" | sed -e 's/initdemo.sh//'`;
+export id=`id -u`;
 
+# ----------------------------- check if root
+if [ "x$id" != "x0" ]
+then
+	echo "Script must be ran as root"
+	exit
+fi
+
+# ----------------------------- database name
 DIALOG=${DIALOG=dialog}
 DIALOG="$DIALOG --ascii-lines"
 fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
@@ -26,12 +35,31 @@ exit;;
   255)
 exit;;
 esac
+
+# ---------------------------- database port
+DIALOG=${DIALOG=dialog}
+fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
+trap "rm -f $fichtemp" 0 1 2 5 15
+$DIALOG --title "Init Dolibarr with demo values" --clear \
+        --inputbox "Mysql port (ex: 3306):" 16 51 3306 2> $fichtemp
+
+valret=$?
+
+case $valret in
+  0)
+port=`cat $fichtemp`;;
+  1)
+exit;;
+  255)
+exit;;
+esac
+
 # ---------------------------- compte admin mysql
 DIALOG=${DIALOG=dialog}
 fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
 trap "rm -f $fichtemp" 0 1 2 5 15
 $DIALOG --title "Init Dolibarr with demo values" --clear \
-        --inputbox "Mysql user login (ex: root):" 16 51 2> $fichtemp
+        --inputbox "Mysql root login (ex: root):" 16 51 root 2> $fichtemp
 
 valret=$?
 
@@ -43,12 +71,13 @@ exit;;
   255)
 exit;;
 esac
+
 # ---------------------------- mot de passe admin mysql
 DIALOG=${DIALOG=dialog}
 fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
 trap "rm -f $fichtemp" 0 1 2 5 15
 $DIALOG --title "Init Dolibarr with demo values" --clear \
-        --inputbox "Password for Mysql user login :" 16 51 2> $fichtemp
+        --inputbox "Password for Mysql root login :" 16 51 2> $fichtemp
 
 valret=$?
 
@@ -60,6 +89,7 @@ exit;;
   255)
 exit;;
 esac
+
 # ---------------------------- chemin d'accès du répertoire documents
 DIALOG=${DIALOG=dialog}
 fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
@@ -77,10 +107,11 @@ exit;;
   255)
 exit;;
 esac
+
 # ---------------------------- confirmation
 DIALOG=${DIALOG=dialog}
 $DIALOG --title "Init Dolibarr with demo values" --clear \
-        --yesno "Do you confirm ? \n Mysql database : '$base' \n Mysql login: '$admin' \n Mysql password : '$passwd' \n Documents dir : '$docs'" 15 40
+        --yesno "Do you confirm ? \n Mysql database : '$base' \n Mysql port : '$port' \n Mysql login: '$admin' \n Mysql password : '$passwd' \n Documents dir : '$docs'" 15 40
 
 case $? in
         0)      echo "Ok, start process...";;
@@ -89,7 +120,12 @@ case $? in
 esac
 
 # ---------------------------- run sql file
-mysql -u$admin -p$passwd $base < $mydir/initdemo.sql
+if [ "x$passwd" != "x" ]
+then
+	export passwd="-p$passwd"
+fi
+echo "mysql -u$admin $passwd $base < $mydir/initdemo.sql"
+mysql -u$admin $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 d4201346e7a..076cbffc025 100644
--- a/dev/initdemo/removedemo.sh
+++ b/dev/initdemo/removedemo.sh
@@ -29,6 +29,7 @@ esac
 
 # ---------------------------- remove conf file
 echo "Remove file $mydir../../htdocs/conf/conf.php"
+cp -pf $mydir../../htdocs/conf/conf.php $mydir../../htdocs/conf/conf.sav.php 2>/dev/null
 rm $mydir../../htdocs/conf/conf.php 2>/dev/null
 echo "Remove file $mydir../../install.lock"
 rm $mydir../../install.lock 2>/dev/null