@@ -134,7 +134,7 @@ sub startup {

   }

   # Repository home

-  my $rep_home = $ENV{GITPREP_REP_HOME} || $self->home->rel_file('data/rep');

+  my $rep_home = "$data_dir/rep";

   unless (-d $rep_home) {

     mkdir $rep_home

       or croak "Can't create directory $rep_home: $!";

@@ -158,8 +158,7 @@ sub startup {

   $self->git($git);

   # DBI

-  my $db_file = $ENV{GITPREP_DB_FILE}

-    || $self->home->rel_file('data/gitprep.db');

+  my $db_file = "$data_dir/gitprep.db";

   my $dbi = DBIx::Custom->connect(

     dsn => "dbi:SQLite:database=$db_file",

     connector => 1,

@@ -11,14 +11,9 @@ use Test::Mojo;

 # Data directory

 my $data_dir =  $ENV{GITPREP_DATA_DIR} = "$FindBin::Bin/basic";

-# Test DB

-$ENV{GITPREP_DB_FILE} = "$FindBin::Bin/basic/gitprep.db";

-

-# Test Repository home

 # You must clone "gitprep_t"

 # cd basic/rep/kimoto

 # git clone --bare https://github.com/yuki-kimoto/gitprep_t.git

-$ENV{GITPREP_REP_HOME} = "$FindBin::Bin/basic/rep";

 $ENV{GITPREP_NO_MYCONFIG} = 1;

@@ -15,10 +15,10 @@ use Test::Mojo;

 my $data_dir =  $ENV{GITPREP_DATA_DIR} = "$FindBin::Bin/import_rep";

 # Test DB

-my $db_file = $ENV{GITPREP_DB_FILE} = "$FindBin::Bin/import_rep/gitprep.db";

+my $db_file = "$data_dir/gitprep.db";

 # Test Repository home

-my $rep_home = $ENV{GITPREP_REP_HOME} = "$FindBin::Bin/import_rep/rep";

+my $rep_home = "$data_dir/rep";

 $ENV{GITPREP_NO_MYCONFIG} = 1;

@@ -16,10 +16,10 @@ use Test::Mojo;

 my $data_dir =  $ENV{GITPREP_DATA_DIR} = "$FindBin::Bin/smart_http";

 # Test DB

-my $db_file = $ENV{GITPREP_DB_FILE} = "$FindBin::Bin/smart_http/gitprep.db";

+my $db_file = "$data_dir/gitprep.db";

 # Test Repository home

-my $rep_home = $ENV{GITPREP_REP_HOME} = "$FindBin::Bin/smart_http/rep";

+my $rep_home = "$data_dir/rep";

 $ENV{GITPREP_NO_MYCONFIG} = 1;

@@ -15,10 +15,10 @@ use Test::Mojo;

 my $data_dir =  $ENV{GITPREP_DATA_DIR} = "$FindBin::Bin/user";

 # Test DB

-my $db_file = $ENV{GITPREP_DB_FILE} = "$FindBin::Bin/user/gitprep.db";

+my $db_file = "$data_dir/gitprep.db";

 # Test Repository home

-my $rep_home = $ENV{GITPREP_REP_HOME} = "$FindBin::Bin/user/rep";

+my $rep_home = "$data_dir/rep";

 $ENV{GITPREP_NO_MYCONFIG} = 1;