Fix for dist versions

diff --git a/.gitignore b/.gitignore
index f9fcc5d..d939243 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-./inc/
+inc/*
 Thumbs.db
 Gitalist-*
 *.swp

diff --git a/Changes b/Changes
index 9895eef..5dca48a 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,7 @@
 This file documents the revision history for Perl extension Gitalist.
 
+    - Fix for distribution by not including script/env
+
 0.002001 2010-07-03
     - Fix for loadCommitInfo.
     - Fix tests to work with local-libbery.

diff --git a/Makefile.PL b/Makefile.PL
index fb8b06a..db053b2 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,7 +1,12 @@
 #!/usr/bin/env perl
 
 use FindBin;
-BEGIN { do "$FindBin::Bin/script/env" or die $@ }
+BEGIN {
+    my $env = "$FindBin::Bin/script/env";
+    if (-r $env) {
+        do $env or die $@;
+    }
+}
 
 use strict;
 use warnings;

diff --git a/script/gitalist_cgi.pl b/script/gitalist_cgi.pl
index 4afe54e..5038c8b 100755 (executable)
--- a/script/gitalist_cgi.pl
+++ b/script/gitalist_cgi.pl
@@ -1,7 +1,12 @@
 #!/usr/bin/env perl
 
 use FindBin;
-BEGIN { do "$FindBin::Bin/env" or die $@ }
+BEGIN {
+    my $env = "$FindBin::Bin/script/env";
+    if (-r $env) {
+        do $env or die $@;
+    }
+}
 
 use Catalyst::ScriptRunner;
 Catalyst::ScriptRunner->run('Gitalist', 'CGI');

diff --git a/script/gitalist_create.pl b/script/gitalist_create.pl
index b8e3fea..03a823c 100755 (executable)
--- a/script/gitalist_create.pl
+++ b/script/gitalist_create.pl
@@ -1,6 +1,11 @@
 #!/usr/bin/env perl
 use FindBin;
-BEGIN { do "$FindBin::Bin/env" or die $@ }
+BEGIN {
+    my $env = "$FindBin::Bin/script/env";
+    if (-r $env) {
+        do $env or die $@;
+    }
+}
 
 use strict;
 use warnings;

diff --git a/script/gitalist_fastcgi.pl b/script/gitalist_fastcgi.pl
index 6948d49..1c351c3 100755 (executable)
--- a/script/gitalist_fastcgi.pl
+++ b/script/gitalist_fastcgi.pl
@@ -1,6 +1,11 @@
 #!/usr/bin/env perl
 use FindBin;
-BEGIN { do "$FindBin::Bin/env" or die $@ }
+BEGIN {
+    my $env = "$FindBin::Bin/script/env";
+    if (-r $env) {
+        do $env or die $@;
+    }
+}
 
 use Catalyst::ScriptRunner;
 Catalyst::ScriptRunner->run('Gitalist','FastCGI');

diff --git a/script/gitalist_server.pl b/script/gitalist_server.pl
index 37d6b1f..45e67a5 100755 (executable)
--- a/script/gitalist_server.pl
+++ b/script/gitalist_server.pl
@@ -1,6 +1,11 @@
 #!/usr/bin/env perl
 use FindBin;
-BEGIN { do "$FindBin::Bin/env" or die $@ }
+BEGIN {
+    my $env = "$FindBin::Bin/script/env";
+    if (-r $env) {
+        do $env or die $@;
+    }
+}
 
 BEGIN {
     $ENV{CATALYST_SCRIPT_GEN} = 40;

diff --git a/script/gitalist_test.pl b/script/gitalist_test.pl
index ab28c5c..b59799b 100755 (executable)
--- a/script/gitalist_test.pl
+++ b/script/gitalist_test.pl
@@ -1,6 +1,11 @@
 #!/usr/bin/env perl
 use FindBin;
-BEGIN { do "$FindBin::Bin/env" or die $@ }
+BEGIN {
+    my $env = "$FindBin::Bin/script/env";
+    if (-r $env) {
+        do $env or die $@;
+    }
+}
 
 use Catalyst::ScriptRunner;
 Catalyst::ScriptRunner->run('Gitalist','Test');