[Bps-public-commit] RT-Extension-rt_cpan_org branch, rt4, updated. 8f8b114e6ed2877066f18d415a921ca9d0df4aab

[Thomas Sibley]

The branch, rt4 has been updated
       via  8f8b114e6ed2877066f18d415a921ca9d0df4aab (commit)
       via  d68e9f5ec83e3ab6f7a908e4b8f1b8af88b4f82f (commit)
      from  2b9ad7912f42078835f6f2a3baa8344072ee57ee (commit)

Summary of changes:
 bin/pull-live | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit d68e9f5ec83e3ab6f7a908e4b8f1b8af88b4f82f
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Wed Mar 20 13:58:24 2013 -0700

    Use a default perl from perlbrew if available, or accept an explicit --perl option
    
    Relying solely on $^X doesn't work well in production since it resolves
    symlinks.

diff --git a/bin/pull-live b/bin/pull-live
index b341198..5049688 100755
--- a/bin/pull-live
+++ b/bin/pull-live
@@ -3,18 +3,24 @@
 use Getopt::Long;
 
 my $rthome = $ENV{'RTHOME'} || "/home/rtcpan/rt40";
+
+my $perlbrew_perl = "/home/rtcpan/perlbrew/perls/rt/bin/perl";
+my $perl =       $ENV{'PERL'} ?   $ENV{'PERL'} :
+            -e $perlbrew_perl ? $perlbrew_perl :
+                                           $^X ;
+
 my (@skip, @only, $batch);
 GetOptions(
     "skip=s@" => \@skip,
     "only=s@" => \@only,
     "rt=s"    => \$rthome,
+    "perl=s"  => \$perl,
     "batch"   => \$batch,
 );
 
 sub skip($);
 
-my $perl = $ENV{'PERL'} = $^X;
-
+$ENV{'PERL'} = $perl;
 $ENV{'RTHOME'} = $rthome;
 
 unless ($batch) {

commit 8f8b114e6ed2877066f18d415a921ca9d0df4aab
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Wed Mar 20 14:03:58 2013 -0700

    Remove the version from the rt directory
    
    We manage it in git, even between versions, so changing path names is
    annoying.

diff --git a/bin/pull-live b/bin/pull-live
index 5049688..62154ac 100755
--- a/bin/pull-live
+++ b/bin/pull-live
@@ -2,7 +2,7 @@
 
 use Getopt::Long;
 
-my $rthome = $ENV{'RTHOME'} || "/home/rtcpan/rt40";
+my $rthome = $ENV{'RTHOME'} || "/home/rtcpan/rt";
 
 my $perlbrew_perl = "/home/rtcpan/perlbrew/perls/rt/bin/perl";
 my $perl =       $ENV{'PERL'} ?   $ENV{'PERL'} :

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