* Ship ikiwiki executable as ikiwiki.pl in source to avoid issues on

  case-sensative filesystems like OSX.

diff --git a/Makefile.PL b/Makefile.PL
index 303116faae35e630a6e9239b4569849150fd3bef..7b61acc617195fc442d8574ea867f22c56187a6f 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -12,7 +12,7 @@ install:: extra_install
 pure_install:: extra_install
 
 extra_build:
-       ./ikiwiki doc html --templatedir=templates --underlaydir=basewiki \
+       ./ikiwiki.pl doc html --templatedir=templates --underlaydir=basewiki \
                --wikiname="ikiwiki" --verbose --no-rcs \
                --exclude=/discussion --no-discussion \
                --plugin=brokenlinks --plugin=pagecount \
@@ -50,5 +50,5 @@ extra_install:
 WriteMakefile(
        'NAME'          => 'IkiWiki',
        'PM_FILTER'     => 'grep -v "removed by Makefile"',
-       'EXE_FILES'     => ['ikiwiki'],
+       'EXE_FILES'     => ['ikiwiki.pl'],
 );

diff --git a/debian/changelog b/debian/changelog
index eaa9b816f72c3dc8ae1b48f9f031fd5ad9650c6a..8fc3b66dbf7e6b99a109e564323f3dd771847d5a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,10 @@ ikiwiki (1.17) UNRELEASED; urgency=low
     templates but can be useful for things like making comma-delimited lists
     of tags or what have you.
   * Remove <br> from end of aggregate preprocessor directive output.
+  * Ship ikiwiki executable as ikiwiki.pl in source to avoid issues on
+    case-sensative filesystems like OSX.
 
- -- Joey Hess <joeyh@debian.org>  Sat,  5 Aug 2006 17:15:12 -0400
+ -- Joey Hess <joeyh@debian.org>  Tue,  8 Aug 2006 10:52:23 -0400
 
 ikiwiki (1.16) unstable; urgency=low
 

diff --git a/ikiwiki b/ikiwiki
deleted file mode 100755 (executable)
index 1342ec5..0000000
--- a/ikiwiki
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/usr/bin/perl -T
-$ENV{PATH}="/usr/local/bin:/usr/bin:/bin";
-delete @ENV{qw{IFS CDPATH ENV BASH_ENV}};
-
-package IkiWiki;
-use warnings;
-use strict;
-use lib '.'; # For use without installation, removed by Makefile.
-use IkiWiki;
-
-sub usage () { #{{{
-       die "usage: ikiwiki [options] source dest\n";
-} #}}}
-
-sub getconfig () { #{{{
-       if (! exists $ENV{WRAPPED_OPTIONS}) {
-               %config=defaultconfig();
-               eval q{use Getopt::Long};
-               Getopt::Long::Configure('pass_through');
-               GetOptions(
-                       "setup|s=s" => \$config{setup},
-                       "wikiname=s" => \$config{wikiname},
-                       "verbose|v!" => \$config{verbose},
-                       "rebuild!" => \$config{rebuild},
-                       "refresh!" => \$config{refresh},
-                       "wrappers!" => \$config{wrappers},
-                       "getctime" => \$config{getctime},
-                       "wrappermode=i" => \$config{wrappermode},
-                       "rcs=s" => \$config{rcs},
-                       "no-rcs" => sub { $config{rcs}="" },
-                       "anonok!" => \$config{anonok},
-                       "rss!" => \$config{rss},
-                       "cgi!" => \$config{cgi},
-                       "discussion!" => \$config{discussion},
-                       "w3mmode!" => \$config{w3mmode},
-                       "notify!" => \$config{notify},
-                       "url=s" => \$config{url},
-                       "cgiurl=s" => \$config{cgiurl},
-                       "historyurl=s" => \$config{historyurl},
-                       "diffurl=s" => \$config{diffurl},
-                       "svnrepo" => \$config{svnrepo},
-                       "svnpath" => \$config{svnpath},
-                       "adminemail=s" => \$config{adminemail},
-                       "timeformat=s" => \$config{timeformat},
-                       "exclude=s@" => sub {
-                               $config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$_[1]/;
-                       },
-                       "adminuser=s@" => sub {
-                               push @{$config{adminuser}}, $_[1]
-                       },
-                       "templatedir=s" => sub {
-                               $config{templatedir}=possibly_foolish_untaint($_[1])
-                       },
-                       "underlaydir=s" => sub {
-                               $config{underlaydir}=possibly_foolish_untaint($_[1])
-                       },
-                       "wrapper:s" => sub {
-                               $config{wrapper}=$_[1] ? $_[1] : "ikiwiki-wrap"
-                       },
-                       "plugin=s@" => sub {
-                               push @{$config{plugin}}, $_[1];
-                       },
-                       "disable-plugin=s@" => sub {
-                               $config{plugin}=[grep { $_ ne $_[1] } @{$config{plugin}}];
-                       },
-                       "pingurl" => sub {
-                               push @{$config{pingurl}}, $_[1];
-                       }
-               ) || usage();
-
-               if (! $config{setup}) {
-                       loadplugins();
-                       usage() unless @ARGV == 2;
-                       $config{srcdir} = possibly_foolish_untaint(shift @ARGV);
-                       $config{destdir} = possibly_foolish_untaint(shift @ARGV);
-                       checkconfig();
-               }
-       }
-       else {
-               # wrapper passes a full config structure in the environment
-               # variable
-               eval possibly_foolish_untaint($ENV{WRAPPED_OPTIONS});
-               if ($@) {
-                       error("WRAPPED_OPTIONS: $@");
-               }
-               loadplugins();
-               checkconfig();
-       }
-} #}}}
-
-sub main () { #{{{
-       getconfig();
-       
-       if ($config{cgi}) {
-               lockwiki();
-               loadindex();
-               require IkiWiki::CGI;
-               cgi();
-       }
-       elsif ($config{setup}) {
-               require IkiWiki::Setup;
-               setup();
-       }
-       elsif ($config{wrapper}) {
-               lockwiki();
-               require IkiWiki::Wrapper;
-               gen_wrapper();
-       }
-       else {
-               lockwiki();
-               loadindex();
-               require IkiWiki::Render;
-               rcs_update();
-               refresh();
-               rcs_notify() if $config{notify};
-               saveindex();
-       }
-} #}}}
-
-main;

diff --git a/ikiwiki.pl b/ikiwiki.pl
new file mode 100755 (executable)
index 0000000..1342ec5
--- /dev/null
+++ b/ikiwiki.pl
@@ -0,0 +1,120 @@
+#!/usr/bin/perl -T
+$ENV{PATH}="/usr/local/bin:/usr/bin:/bin";
+delete @ENV{qw{IFS CDPATH ENV BASH_ENV}};
+
+package IkiWiki;
+use warnings;
+use strict;
+use lib '.'; # For use without installation, removed by Makefile.
+use IkiWiki;
+
+sub usage () { #{{{
+       die "usage: ikiwiki [options] source dest\n";
+} #}}}
+
+sub getconfig () { #{{{
+       if (! exists $ENV{WRAPPED_OPTIONS}) {
+               %config=defaultconfig();
+               eval q{use Getopt::Long};
+               Getopt::Long::Configure('pass_through');
+               GetOptions(
+                       "setup|s=s" => \$config{setup},
+                       "wikiname=s" => \$config{wikiname},
+                       "verbose|v!" => \$config{verbose},
+                       "rebuild!" => \$config{rebuild},
+                       "refresh!" => \$config{refresh},
+                       "wrappers!" => \$config{wrappers},
+                       "getctime" => \$config{getctime},
+                       "wrappermode=i" => \$config{wrappermode},
+                       "rcs=s" => \$config{rcs},
+                       "no-rcs" => sub { $config{rcs}="" },
+                       "anonok!" => \$config{anonok},
+                       "rss!" => \$config{rss},
+                       "cgi!" => \$config{cgi},
+                       "discussion!" => \$config{discussion},
+                       "w3mmode!" => \$config{w3mmode},
+                       "notify!" => \$config{notify},
+                       "url=s" => \$config{url},
+                       "cgiurl=s" => \$config{cgiurl},
+                       "historyurl=s" => \$config{historyurl},
+                       "diffurl=s" => \$config{diffurl},
+                       "svnrepo" => \$config{svnrepo},
+                       "svnpath" => \$config{svnpath},
+                       "adminemail=s" => \$config{adminemail},
+                       "timeformat=s" => \$config{timeformat},
+                       "exclude=s@" => sub {
+                               $config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$_[1]/;
+                       },
+                       "adminuser=s@" => sub {
+                               push @{$config{adminuser}}, $_[1]
+                       },
+                       "templatedir=s" => sub {
+                               $config{templatedir}=possibly_foolish_untaint($_[1])
+                       },
+                       "underlaydir=s" => sub {
+                               $config{underlaydir}=possibly_foolish_untaint($_[1])
+                       },
+                       "wrapper:s" => sub {
+                               $config{wrapper}=$_[1] ? $_[1] : "ikiwiki-wrap"
+                       },
+                       "plugin=s@" => sub {
+                               push @{$config{plugin}}, $_[1];
+                       },
+                       "disable-plugin=s@" => sub {
+                               $config{plugin}=[grep { $_ ne $_[1] } @{$config{plugin}}];
+                       },
+                       "pingurl" => sub {
+                               push @{$config{pingurl}}, $_[1];
+                       }
+               ) || usage();
+
+               if (! $config{setup}) {
+                       loadplugins();
+                       usage() unless @ARGV == 2;
+                       $config{srcdir} = possibly_foolish_untaint(shift @ARGV);
+                       $config{destdir} = possibly_foolish_untaint(shift @ARGV);
+                       checkconfig();
+               }
+       }
+       else {
+               # wrapper passes a full config structure in the environment
+               # variable
+               eval possibly_foolish_untaint($ENV{WRAPPED_OPTIONS});
+               if ($@) {
+                       error("WRAPPED_OPTIONS: $@");
+               }
+               loadplugins();
+               checkconfig();
+       }
+} #}}}
+
+sub main () { #{{{
+       getconfig();
+       
+       if ($config{cgi}) {
+               lockwiki();
+               loadindex();
+               require IkiWiki::CGI;
+               cgi();
+       }
+       elsif ($config{setup}) {
+               require IkiWiki::Setup;
+               setup();
+       }
+       elsif ($config{wrapper}) {
+               lockwiki();
+               require IkiWiki::Wrapper;
+               gen_wrapper();
+       }
+       else {
+               lockwiki();
+               loadindex();
+               require IkiWiki::Render;
+               rcs_update();
+               refresh();
+               rcs_notify() if $config{notify};
+               saveindex();
+       }
+} #}}}
+
+main;

diff --git a/t/syntax.t b/t/syntax.t
index 1e6b047478a5e9bd2ba06774893f346d3204b2dd..2462464ef26c3811e7e85a17068656082f25fe81 100755 (executable)
--- a/t/syntax.t
+++ b/t/syntax.t
@@ -3,7 +3,7 @@ use warnings;
 use strict;
 use Test;
 
-my @progs="ikiwiki";
+my @progs="ikiwiki.pl";
 my @libs="IkiWiki.pm";
 push @libs, map { chomp; $_ } `find IkiWiki -type f -name \\*.pm`;