[Bps-public-commit] Shipwright branch, master, updated. 0c840bd0fb18a78f48f1f53eb64acac59526bba9

[sunnavy at bestpractical.com]

The branch, master has been updated
       via  0c840bd0fb18a78f48f1f53eb64acac59526bba9 (commit)
      from  669ec5e16f2e034eabce69dae06c3f7987f381b3 (commit)

Summary of changes:
 bin/shipwright    |    6 ------
 lib/Shipwright.pm |    7 +++++++
 2 files changed, 7 insertions(+), 6 deletions(-)

- Log -----------------------------------------------------------------
commit 0c840bd0fb18a78f48f1f53eb64acac59526bba9
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu Sep 17 14:58:01 2009 +0800

    mv default env set from bin/shipwright to Shipwright.pm

diff --git a/bin/shipwright b/bin/shipwright
index 0d67f46..753f63a 100755
--- a/bin/shipwright
+++ b/bin/shipwright
@@ -9,11 +9,5 @@ use Cwd;
 local $SIG{INT} = sub { warn "Stopped\n"; exit; };
 
 my $cwd = getcwd;
-$ENV{SHIPWRIGHT_MAKE} ||= 'make';
-$ENV{SHIPWRIGHT_SVK} ||= 'svk';
-$ENV{SHIPWRIGHT_SVN} ||= 'svn';
-$ENV{SHIPWRIGHT_GIT} ||= 'git';
-$ENV{PERL_MM_USE_DEFAULT} ||= 1;
-$ENV{SHIPWRIGHT_LWP_TIMEOUT} ||= 1200;
 Shipwright::Script->dispatch();
 chdir $cwd;
diff --git a/lib/Shipwright.pm b/lib/Shipwright.pm
index 8591b72..bc07a49 100644
--- a/lib/Shipwright.pm
+++ b/lib/Shipwright.pm
@@ -12,6 +12,13 @@ use Shipwright::Logger;
 use Shipwright::Util;
 use File::Spec::Functions qw/catfile tmpdir/;
 
+$ENV{SHIPWRIGHT_MAKE} ||= 'make';
+$ENV{SHIPWRIGHT_SVK} ||= 'svk';
+$ENV{SHIPWRIGHT_SVN} ||= 'svn';
+$ENV{SHIPWRIGHT_GIT} ||= 'git';
+$ENV{PERL_MM_USE_DEFAULT} ||= 1;
+$ENV{SHIPWRIGHT_LWP_TIMEOUT} ||= 1200;
+
 sub new {
     my $class = shift;
 

-----------------------------------------------------------------------