Unfuck -p option to do what I have a finger macro for

diff --git a/Changes b/Changes
index 5e9d81b..84a1137 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,9 @@
 This file documents the revision history for Perl extension Catalyst-Devel.
 
+        - Remove -p option for pid file, and restore it to the port number,
+          as it should be -port|-p (t0m)
+        - Document -pidfile in myapp_server.pl POD (t0m)
+
 1.13    2009-05-11 02:50
         - add [-pidfile|-p] option for myapp_server.pl (caelum)
         - Bump dependency on Config::General (caelum)

diff --git a/lib/Catalyst/Devel.pm b/lib/Catalyst/Devel.pm
index 1245a17..4ddc99b 100644 (file)
--- a/lib/Catalyst/Devel.pm
+++ b/lib/Catalyst/Devel.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 our $VERSION             = '1.13';
-our $CATALYST_SCRIPT_GEN = 33;
+our $CATALYST_SCRIPT_GEN = 36;
 
 =head1 NAME
 

diff --git a/lib/Catalyst/Helper.pm b/lib/Catalyst/Helper.pm
index 536fa6f..0e2c49a 100644 (file)
--- a/lib/Catalyst/Helper.pm
+++ b/lib/Catalyst/Helper.pm
@@ -991,7 +991,7 @@ GetOptions(
     'restartdirectory=s@' => \$restart_directory,
     'followsymlinks'      => \$follow_symlinks,
     'background'          => \$background,
-    'pidfile|p=s'         => \$pidfile,
+    'pidfile=s'           => \$pidfile,
 );
 
 pod2usage(1) if $help;
@@ -1050,6 +1050,8 @@ require [% name %];
    -follow_symlinks   follow symlinks in search directories
                       (defaults to false. this is a no-op on Win32)
    -background        run the process in the background
+   -pidfile           specify filename for pid file
+
  See also:
    perldoc Catalyst::Manual
    perldoc Catalyst::Manual::Intro