diff options
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rwxr-xr-x | ikiwiki.in | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 6ab7b1d70..c63bbcc39 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ ikiwiki (2.66) UNRELEASED; urgency=low inside tagbase, when it's set. * htmlscrubber: Add a config setting that can be used to disable the scrubber acting on a set of pages. + * Epand usage message and add --help. Closes: #500344 -- Joey Hess <joeyh@debian.org> Thu, 25 Sep 2008 13:45:55 -0400 diff --git a/ikiwiki.in b/ikiwiki.in index cb9e3c347..f96daab0b 100755 --- a/ikiwiki.in +++ b/ikiwiki.in @@ -10,7 +10,8 @@ use lib '.'; # For use in nonstandard directory, munged by Makefile. use IkiWiki; sub usage () { #{{{ - die gettext("usage: ikiwiki [options] source dest"), "\n"; + die gettext("usage: ikiwiki [options] source dest"), "\n", + gettext(" ikiwiki --setup configfile"), "\n"; } #}}} sub getconfig () { #{{{ @@ -94,6 +95,7 @@ sub getconfig () { #{{{ print "ikiwiki version $IkiWiki::version\n"; exit; }, + "help|h" => sub { $SIG{__WARN__}=sub {}; die }, ) || usage(); if (! $config{setup} && ! $config{render}) { |