Merge lp:~rr.clearcorp/oerptools/2.0-oerp into lp:oerptools

[Ronald Rubi]

[FIX] Fix alter table openerp-test-db.sh, change directory db-to-db.sh

=== modified file 'bash/openerp-scripts/test-db/db-to-db.sh'
--- bash/openerp-scripts/test-db/db-to-db.sh	2012-01-24 00:04:16 +0000
+++ bash/openerp-scripts/test-db/db-to-db.sh	2013-03-21 20:19:21 +0000
@@ -3,7 +3,7 @@
 touch /var/log/openerp/cp-db.log
 chown openerp:openerp /var/log/openerp/cp-db.log
 
-export OPENERP_CCORP_DIR="/usr/local/share/openerp-ccorp-scripts"
+export OPENERP_CCORP_DIR="/usr/local/share/oerptools/bash"
 
 cd / #Avoids the could not change directory to "/root" error
 

=== modified file 'bash/openerp-scripts/test-db/openerp-test-db.sh'
--- bash/openerp-scripts/test-db/openerp-test-db.sh	2012-06-27 04:34:04 +0000
+++ bash/openerp-scripts/test-db/openerp-test-db.sh	2013-03-21 20:19:21 +0000
@@ -20,8 +20,8 @@
 #       MA 02110-1301, USA.
 
 if [[ ! -d $OPENERP_CCORP_DIR ]]; then
-	echo "openerp-ccorp-scripts not installed."
-	exit 1
+    echo "openerp-ccorp-scripts not installed."
+    exit 1
 fi
 
 #~ Libraries import
@@ -38,7 +38,7 @@
 server_name=openerp_$3
 proc_name=${server_name:0:15}
 if [[ `ps -A | grep -c $proc_name` -gt 0 ]]; then
-	killall -s KILL openerp_$3
+    killall -s KILL openerp_$3
 fi
 
 # Re-create the database
@@ -53,6 +53,6 @@
 
 # Restart copy server
 /etc/init.d/openerp-server-$3 start
-sudo -u postgres psql -c "ALTER DATABASE $2 OWNER TO openerp_$3"
+sudo -u postgres psql -c "ALTER DATABASE $2 OWNER TO openerp"
 
 exit 0