From 173e65eae2b7fdd1dba2080f65c6265df4bb507b Mon Sep 17 00:00:00 2001
From: Fabien Tassin <fta@ubuntu.com>
Date: Mon, 22 Dec 2008 01:13:36 +0100
Subject: * [mozclient] search the main nobin script in the system wide
 mozclient   path if we are building with a conf-dir and no script was found  
 - update src/mozclient/lib/MozClient/VCS.pm

---
 src/mozclient/lib/MozClient/VCS.pm | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/mozclient/lib/MozClient/VCS.pm b/src/mozclient/lib/MozClient/VCS.pm
index 1471474..29963ec 100644
--- a/src/mozclient/lib/MozClient/VCS.pm
+++ b/src/mozclient/lib/MozClient/VCS.pm
@@ -280,11 +280,24 @@ sub nobin_cleanup {
   $self->LOG("MozClient::nobin_cleanup()");
 
   $self->chdir($self->work_dir . "/" . $self->{'MOZCLIENT_MOZDIRNAME'});
-  my $cmd = sprintf "sh %s > REMOVED+${nobinonly}.txt 2>&1",
-    $self->{'MOZCLIENT_EXCLUDE_SCRIPT'};
   if (-e $self->{'MOZCLIENT_EXCLUDE_SCRIPT'}) {
+    my $cmd = sprintf "sh %s > REMOVED+${nobinonly}.txt 2>&1",
+      $self->{'MOZCLIENT_EXCLUDE_SCRIPT'};
     $self->run_shell($cmd);
   }
+  elsif (defined $INC[1] && $INC[1] =~ m,(.*/mozclient)/,) {
+    my $dir = $1;
+    $self->{'MOZCLIENT_EXCLUDE_SCRIPT'} =~ m,/([^/]*)$,;
+    my $file = $1;
+    if (-e "$dir/$file") {
+      my $cmd = sprintf "sh %s > REMOVED+${nobinonly}.txt 2>&1",
+        "$dir/$file";
+      $self->run_shell($cmd);
+    }
+    else {
+      $self->LOG("*warn* can't find $dir/$file");
+    }
+  }
   else {
     $self->LOG("*warn* can't find " . $self->{'MOZCLIENT_EXCLUDE_SCRIPT'});
   }
-- 
cgit v1.2.3