Fix require line to check for location of find_species.pl

svn path=/; revision=54

diff --git a/interactome_scripts/fasta_header_fix.pl b/interactome_scripts/fasta_header_fix.pl
index f943e6151c3e0fcb082e5869a752e06818766f52..828440f22e0ca657276ccf8a2648ff892cb58fda 100755 (executable)
--- a/interactome_scripts/fasta_header_fix.pl
+++ b/interactome_scripts/fasta_header_fix.pl
@@ -3,7 +3,11 @@
 use strict;
 use warnings;
 
-require "$ENV{HOME}/scripts/jaiswallab/interactome_scripts/find_species.pl";
+if(-e "$ENV{HOME}/scripts/jaiswallab/interactome_scripts/find_species.pl") {
+       require "$ENV{HOME}/scripts/jaiswallab/interactome_scripts/find_species.pl";
+}elsif(-e "$ENV{HOME}/bin/find_species.pl") {
+       require "$ENV{HOME}/bin/find_species.pl";
+}
 
 my @files;
 

diff --git a/interactome_scripts/fasta_verify.pl b/interactome_scripts/fasta_verify.pl
index b3c1d6acf2c378939734563cf1c8d6ee8e48f9e2..21b4b98f6a76f6ccfddf8aa9aef687ce5896f8f2 100755 (executable)
--- a/interactome_scripts/fasta_verify.pl
+++ b/interactome_scripts/fasta_verify.pl
@@ -3,7 +3,11 @@
 use strict;
 use warnings;
 
-require "$ENV{HOME}/scripts/jaiswallab/interactome_scripts/find_species.pl";
+if(-e "$ENV{HOME}/scripts/jaiswallab/interactome_scripts/find_species.pl") {
+       require "$ENV{HOME}/scripts/jaiswallab/interactome_scripts/find_species.pl";
+}elsif(-e "$ENV{HOME}/bin/find_species.pl") {
+       require "$ENV{HOME}/bin/find_species.pl";
+}
 
 
 if($#ARGV != 0) {

diff --git a/interactome_scripts/find_species_test.pl b/interactome_scripts/find_species_test.pl
index 6133513333231f9548dee40d67752bec6759f056..678488492cc836783d737924706ad074916cc97c 100755 (executable)
--- a/interactome_scripts/find_species_test.pl
+++ b/interactome_scripts/find_species_test.pl
@@ -6,7 +6,11 @@
 use strict;
 use warnings;
 
-require "$ENV{HOME}/scripts/jaiswallab/interactome_scripts/find_species.pl";
+if(-e "$ENV{HOME}/scripts/jaiswallab/interactome_scripts/find_species.pl") {
+       require "$ENV{HOME}/scripts/jaiswallab/interactome_scripts/find_species.pl";
+}elsif(-e "$ENV{HOME}/bin/find_species.pl") {
+       require "$ENV{HOME}/bin/find_species.pl";
+}
 
 my @file_array = qx(ls | grep -v ___ | grep -v bad_sequence);
 

diff --git a/interactome_scripts/inparanoid_output_parse.pl b/interactome_scripts/inparanoid_output_parse.pl
index c40ca626e72eb432e47e9bbf759edf359757fd79..f02373e5ac23ae238d09833affc61212adead72f 100755 (executable)
--- a/interactome_scripts/inparanoid_output_parse.pl
+++ b/interactome_scripts/inparanoid_output_parse.pl
@@ -26,7 +26,11 @@ my $new = '';
 GetOptions ('new' => \$new);
 
 
-require "$ENV{HOME}/scripts/jaiswallab/interactome_scripts/find_species.pl";
+if(-e "$ENV{HOME}/scripts/jaiswallab/interactome_scripts/find_species.pl") {
+       require "$ENV{HOME}/scripts/jaiswallab/interactome_scripts/find_species.pl";
+}elsif(-e "$ENV{HOME}/bin/find_species.pl") {
+       require "$ENV{HOME}/bin/find_species.pl";
+}
 
 # open the file to be parsed, assume this is all sqltable* files in directory
 

diff --git a/interactome_scripts/load_species_db.pl b/interactome_scripts/load_species_db.pl
index 0747ccec443a5377292941ab5449d84548cb41e7..e4a4e6c6cdeda14fe42306870c26be9ce185479f 100755 (executable)
--- a/interactome_scripts/load_species_db.pl
+++ b/interactome_scripts/load_species_db.pl
@@ -21,7 +21,11 @@ use DBI;
 use Term::Screen::ReadLine;
 
 # pull in the find_species and find_gene common subroutines
-require "$ENV{HOME}/scripts/jaiswallab/interactome_scripts/find_species.pl";
+if(-e "$ENV{HOME}/scripts/jaiswallab/interactome_scripts/find_species.pl") {
+       require "$ENV{HOME}/scripts/jaiswallab/interactome_scripts/find_species.pl";
+}elsif(-e "$ENV{HOME}/bin/find_species.pl") {
+       require "$ENV{HOME}/bin/find_species.pl";
+}
 
 
 # define the database handle to be used