[Rt-commit] r11106 - rt/branches/3.8-TESTING/sbin

[ruz at bestpractical.com]

Author: ruz
Date: Tue Mar 18 17:17:40 2008
New Revision: 11106

Modified:
   rt/branches/3.8-TESTING/sbin/rt-setup-database.in

Log:
* fix rt-setup-database

Modified: rt/branches/3.8-TESTING/sbin/rt-setup-database.in
==============================================================================
--- rt/branches/3.8-TESTING/sbin/rt-setup-database.in	(original)
+++ rt/branches/3.8-TESTING/sbin/rt-setup-database.in	Tue Mar 18 17:17:40 2008
@@ -100,9 +100,10 @@
 }
 
 # convert init to multiple actions
+my $init = 0;
 if ( $actions[0] eq 'init' ) {
     @actions = qw(create schema acl coredata insert);
-    $args{'datafile'} ||= $RT::EtcPath . "/initialdata";
+    $init = 1;
 }
 
 # set options from environment
@@ -189,7 +190,10 @@
         check_db_compatibility( $RT::Handle->dbh );
 
         print "Now inserting data\n";
-        $RT::Handle->InsertData( $args{'datafile'} || ($args{'datadir'}."/content") );
+        my $file = $args{'datafile'};
+        $file = $RT::EtcPath . "/initialdata" if $init && !$file;
+        $file ||= $args{'datadir'}."/content";
+        $RT::Handle->InsertData( $file );
     }
 }