From 358bb1f3b031d5f32154b4814fc1dca4c041d564 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 2 Oct 2012 23:48:27 +0200
Subject: [PATCH] Fix maintenance scripts

---
 dev/initdata/initdemo.sh   |  8 ++++----
 dev/initdata/removedemo.sh | 24 ++++++++++++++++++++----
 2 files changed, 24 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 dev/initdata/removedemo.sh

diff --git a/dev/initdata/initdemo.sh b/dev/initdata/initdemo.sh
index 2d142b5465b..a01ef9e2ad1 100755
--- a/dev/initdata/initdemo.sh
+++ b/dev/initdata/initdemo.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #------------------------------------------------------
 # Script to purge and init a database with demo values.
 # Note: "dialog" tool need to be available.
@@ -150,10 +150,10 @@ if [ "x$passwd" != "x" ]
 then
 	export passwd="-p$passwd"
 fi
-#echo "mysql -P$port -u$admin -p$passwd $base < $mydir/$dumpfile"
-#mysql -P$port -u$admin -p$passwd $base < $mydir/$dumpfile
+#echo "mysql -P$port -u$admin $passwd $base < $mydir/$dumpfile"
+#mysql -P$port -u$admin $passwd $base < $mydir/$dumpfile
 echo "mysql -P$port -u$admin -p***** $base < $mydir/$dumpfile"
-mysql -P$port -u$admin -p$passwd $base < $mydir/$dumpfile
+mysql -P$port -u$admin $passwd $base < $mydir/$dumpfile
 
 echo "Dolibarr data demo has been loaded."
 echo
diff --git a/dev/initdata/removedemo.sh b/dev/initdata/removedemo.sh
old mode 100644
new mode 100755
index c26c11dbb43..8c58094fe7e
--- a/dev/initdata/removedemo.sh
+++ b/dev/initdata/removedemo.sh
@@ -3,13 +3,29 @@
 # Script to remove setup of a Dolibarr installation.
 # Note: "dialog" tool need to be available.
 #
-# Regis Houssin - regis@dolibarr.fr
+# Regis Houssin       - regis@dolibarr.fr
 # Laurent Destailleur - eldy@users.sourceforge.net
 #------------------------------------------------------
-# WARNING: This script erase all data of database
+# WARNING: This script erase setup of instance, 
+# but not the database
 #------------------------------------------------------
 
-export mydir=`echo "$_" | sed -e 's/removedemo.sh//'`;
+
+export mydir=`echo "$0" | sed -e 's/removedemo.sh//'`;
+if [ "x$mydir" = "x" ]
+then
+    export mydir="./"
+fi
+export id=`id -u`;
+
+
+# ----------------------------- check if root
+if [ "x$id" != "x0" -a "x$id" != "x1001" ]
+then
+    echo "Script must be ran as root"
+    exit
+fi
+
 
 DIALOG=${DIALOG=dialog}
 DIALOG="$DIALOG --ascii-lines"
@@ -34,5 +50,5 @@ 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 "Dolibarr setup has been removed (need to be installed again. database not dropped)."
 echo