From d5de6c4213dc90be9efe84ae0cd769918ebd76ba Mon Sep 17 00:00:00 2001
From: elserj <elserj@localhost>
Date: Sat, 2 Oct 2010 00:02:13 +0000
Subject: [PATCH] Fix require line to check for location of find_species.pl

svn path=/; revision=54
---
 interactome_scripts/fasta_header_fix.pl        | 6 +++++-
 interactome_scripts/fasta_verify.pl            | 6 +++++-
 interactome_scripts/find_species_test.pl       | 6 +++++-
 interactome_scripts/inparanoid_output_parse.pl | 6 +++++-
 interactome_scripts/load_species_db.pl         | 6 +++++-
 5 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/interactome_scripts/fasta_header_fix.pl b/interactome_scripts/fasta_header_fix.pl
index f943e61..828440f 100755
--- 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 b3c1d6a..21b4b98 100755
--- 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 6133513..6784884 100755
--- 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 c40ca62..f02373e 100755
--- 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 0747cce..e4a4e6c 100755
--- 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 
-- 
2.34.1