X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=rsem-generate-ngvector;h=137fa03db354e8e7078a8dd16b535549034f949e;hb=1d786dca8b4c9c1e2176a28a669d2d16cd93e395;hp=c4d26a8f067efead6eb652e04a9cb31bfe6bf9ea;hpb=4496388fd52d4354c746f36b1998477f31c2b0dd;p=rsem.git

diff --git a/rsem-generate-ngvector b/rsem-generate-ngvector
index c4d26a8..137fa03 100755
--- a/rsem-generate-ngvector
+++ b/rsem-generate-ngvector
@@ -2,9 +2,12 @@
 
 use Getopt::Long;
 use Pod::Usage;
-use File::Basename;
+use FindBin;
+use lib $FindBin::Bin;
 use strict;
 
+use rsem_perl_utils;
+
 my $k = 25;
 my $help = 0;
 
@@ -14,29 +17,15 @@ GetOptions("k=i" => \$k,
 pod2usage(-verbose => 2) if ($help == 1);
 pod2usage(-msg => "Invalid number of arguments!", -exitval => 2, -verbose => 2) if (scalar(@ARGV) != 2);
 
-my ($fn, $dir, $suf) = fileparse($0);
+my $dir = "$FindBin::Bin/";
 my $command = "";
 
-$command = $dir."rsem-for-ebseq-calculate-clustering-info $k $ARGV[0] $ARGV[1].ump";
+$command = $dir."EBSeq/rsem-for-ebseq-calculate-clustering-info $k $ARGV[0] $ARGV[1].ump";
 &runCommand($command);
 
-$command = $dir."rsem-for-ebseq-generate-ngvector-from-clustering-info $ARGV[1].ump $ARGV[1].ngvec";
+$command = $dir."EBSeq/rsem-for-ebseq-generate-ngvector-from-clustering-info $ARGV[1].ump $ARGV[1].ngvec";
 &runCommand($command);
 
-# command, {err_msg}
-sub runCommand {
-    print $_[0]."\n";
-    my $status = system($_[0]);
-    if ($status != 0) {
-        my $errmsg;
-        if (scalar(@_) > 1) { $errmsg = $_[1]; }
-        else { $errmsg = "\"$command\" failed! Plase check if you provide correct parameters/options for the pipeline!"; }
-        print $errmsg."\n";
-        exit(-1);
-    }
-    print "\n";
-}
-
 __END__
 
 =head1 NAME