[Rt-commit] r19937 - in rt/3.999/trunk: lib lib/RT

[sartak at bestpractical.com]

Author: sartak
Date: Sat Jun  6 06:37:01 2009
New Revision: 19937

Modified:
   rt/3.999/trunk/lib/RT.pm
   rt/3.999/trunk/lib/RT/Bootstrap.pm
   rt/3.999/trunk/sbin/rt-setup-database

Log:
Remove $RT::EtcPath

Modified: rt/3.999/trunk/lib/RT.pm
==============================================================================
--- rt/3.999/trunk/lib/RT.pm	(original)
+++ rt/3.999/trunk/lib/RT.pm	Sat Jun  6 06:37:01 2009
@@ -62,7 +62,6 @@
 our $VERSION = '3.999.0';
 
 our $BASE_PATH        = Jifty::Util->app_root;
-our $EtcPath          = $BASE_PATH . '/etc';
 our $BinPath          = $BASE_PATH . '/bin';
 our $SbinPath          = $BASE_PATH . '/sbin';
 our $VarPath          = $BASE_PATH . '/var';

Modified: rt/3.999/trunk/lib/RT/Bootstrap.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Bootstrap.pm	(original)
+++ rt/3.999/trunk/lib/RT/Bootstrap.pm	Sat Jun  6 06:37:01 2009
@@ -56,7 +56,7 @@
 
 
     $self->insert_initial_data();
-    $self->insert_data( $RT::EtcPath . "/initialdata" );
+    $self->insert_data( Jifty::Util->app_root . "/etc/initialdata" );
 }
 
 use File::Spec;

Modified: rt/3.999/trunk/sbin/rt-setup-database
==============================================================================
--- rt/3.999/trunk/sbin/rt-setup-database	(original)
+++ rt/3.999/trunk/sbin/rt-setup-database	Sat Jun  6 06:37:01 2009
@@ -98,7 +98,7 @@
 # convert init to multiple actions
 if ( $actions[0] eq 'init' ) {
     @actions = qw(create schema acl insert);
-    $args{'datafile'} ||= $RT::EtcPath . "/initialdata";
+    $args{'datafile'} ||= Jifty::Util->app_root . "/etc/initialdata";
 }
 
 # set options from environment