From: Joey Hess <joey@kodama.kitenet.net>
Date: Sat, 27 Sep 2008 15:17:19 +0000 (-0400)
Subject: Epand usage message and add --help. Closes: #500344
X-Git-Tag: 2.66~74
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=60a80be0b386c1499eecf62843545a91b020ddc8;p=ikiwiki.git

Epand usage message and add --help. Closes: #500344
---

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}) {