From 904132fd7c5e470b26fd9a2b1cbc4ff1ba114c66 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 9 Jan 2010 22:48:46 +0000
Subject: [PATCH] fixup initial RT setup for 3.8

---
 Makefile                     | 11 +++++++----
 rt/FREESIDE_MODIFIED         |  2 +-
 rt/sbin/rt-setup-database.in |  4 +++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 41b3e8c90..2f696dc21 100644
--- a/Makefile
+++ b/Makefile
@@ -355,11 +355,14 @@ create-rt: configure-rt
 	[ -d /opt/rt3/share ] || mkdir /opt/rt3/share #
 	cd rt; make install
 	rt/sbin/rt-setup-database --dba '${DB_USER}' \
-	                          -dba-password '${DB_PASSWORD}' \
-	                          -action schema \
+	                          --dba-password '${DB_PASSWORD}' \
+	                          --action schema \
 	 || true
-	rt/sbin/rt-setup-database --action insert_initial \
-	&& rt/sbin/rt-setup-database --action insert --datafile ${RT_PATH}/etc/initialdata \
+	rt/sbin/rt-setup-database --dba-password '${DB_PASSWORD}' \
+	                          --action coredata \
+	&& rt/sbin/rt-setup-database --dba-password '${DB_PASSWORD}' \
+	                             --action insert \
+	                             --datafile ${RT_PATH}/etc/initialdata \
 	|| true
 
 install-rt:
diff --git a/rt/FREESIDE_MODIFIED b/rt/FREESIDE_MODIFIED
index e1665abbd..ec575dff7 100644
--- a/rt/FREESIDE_MODIFIED
+++ b/rt/FREESIDE_MODIFIED
@@ -1,4 +1,4 @@
- sbin/rt-setup-database.in
+ sbin/rt-setup-database.in # just a small password bugfix now
 config.layout
 config.layout.in
  etc/RT_SiteConfig.pm
diff --git a/rt/sbin/rt-setup-database.in b/rt/sbin/rt-setup-database.in
index a51076fee..ea9b99ba0 100644
--- a/rt/sbin/rt-setup-database.in
+++ b/rt/sbin/rt-setup-database.in
@@ -150,7 +150,9 @@ if ( $db_type eq 'SQLite' && !File::Spec->file_name_is_absolute($db_name) ) {
 }
 
 my $dba_user = $args{'dba'} || $ENV{'RT_DBA_USER'} || $db_user || '';
-my $dba_pass = $args{'dba-password'} || $ENV{'RT_DBA_PASSWORD'};
+my $dba_pass = exists($args{'dba-password'})
+                 ? $args{'dba-password'}
+                 : $ENV{'RT_DBA_PASSWORD'};
 
 if ( !$args{force} && ( !defined $dba_pass || $args{'prompt-for-dba-password'} ) ) {
     $dba_pass = get_dba_password();
-- 
2.11.0