[Bps-public-commit] RT-Extension-LDAPImport branch, master, updated. 0.32_01-5-gb58c043

[Thomas Sibley]

The branch, master has been updated
       via  b58c0432dd6556953e64eefb9d131950779b1351 (commit)
       via  81883a9915e3781506b098748ba2cf08880e6305 (commit)
      from  3c9a39d73363267bde8e36c628150bce26eff7bb (commit)

Summary of changes:
 META.yml                       |    2 +-
 Makefile.PL                    |   10 ++++++++++
 bin/rtldapimport.in            |    1 +
 lib/RT/Extension/LDAPImport.pm |    2 +-
 4 files changed, 13 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 81883a9915e3781506b098748ba2cf08880e6305
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Wed Feb 22 17:44:00 2012 -0500

    Substitute the proper perl path into rtldapimport
    
    Either from the $PERL environment variable or the perl that Makefile.PL
    is run with.

diff --git a/Makefile.PL b/Makefile.PL
index 51938c5..f7a15bc 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -18,9 +18,19 @@ feature "Proper Testing" =>
 
 my ($lp) = ($INC{'RT.pm'} =~ /^(.*)[\\\/]/);
 my $lib_path = join( ' ', "$RT::LocalPath/lib", $lp );
+
+# Straight from perldoc perlvar
+use Config;
+my $secure_perl_path = $Config{perlpath};
+if ($^O ne 'VMS') {
+    $secure_perl_path .= $Config{_exe}
+        unless $secure_perl_path =~ m/$Config{_exe}$/i;
+}
+
 substitute(
     {
         RT_LIB_PATH  => $lib_path,
+        PERL         => $ENV{PERL} || $secure_perl_path,
     },
     {
         sufix => '.in'
diff --git a/bin/rtldapimport.in b/bin/rtldapimport.in
index 02b35bf..bfdc368 100755
--- a/bin/rtldapimport.in
+++ b/bin/rtldapimport.in
@@ -1,4 +1,5 @@
 #!/usr/bin/env perl
+### before: #!@PERL@
 
 use strict;
 use warnings;

commit b58c0432dd6556953e64eefb9d131950779b1351
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Wed Feb 22 17:44:33 2012 -0500

    Version bump

diff --git a/META.yml b/META.yml
index 43cd592..7cd3a31 100644
--- a/META.yml
+++ b/META.yml
@@ -28,4 +28,4 @@ requires:
   Test::More: 0
 resources:
   license: http://dev.perl.org/licenses/
-version: 0.32_01
+version: 0.32_02
diff --git a/lib/RT/Extension/LDAPImport.pm b/lib/RT/Extension/LDAPImport.pm
index d2a50d5..760081a 100644
--- a/lib/RT/Extension/LDAPImport.pm
+++ b/lib/RT/Extension/LDAPImport.pm
@@ -1,7 +1,7 @@
 package RT::Extension::LDAPImport;
 
 # XXX TODO: For historical reasons, this should become 0.33 after 0.32_xx dev releases are done.
-our $VERSION = '0.32_01';
+our $VERSION = '0.32_02';
 
 use warnings;
 use strict;

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