X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/fd2b2f386f30cf2ba578da8a8174dd60ae024adc..3c08aaeea26a0f7e25e9606a54b7c948e0ea7e5d:/ikiwiki.in?ds=inline

diff --git a/ikiwiki.in b/ikiwiki.in
index aa3337938..339efd37c 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -1,7 +1,4 @@
 #!/usr/bin/perl
-$ENV{PATH}="/usr/local/bin:/usr/bin:/bin";
-delete @ENV{qw{IFS CDPATH ENV BASH_ENV}};
-
 package IkiWiki;
 
 use warnings;
@@ -163,24 +160,8 @@ sub main () {
 		    ! $config{clean} &&
 		    ((! $config{refresh} && ! $config{post_commit})
 		     || $config{genwrappers})) {
-			debug(gettext("generating wrappers.."));
 			require IkiWiki::Wrapper;
-			my %origconfig=(%config);
-			foreach my $wrapper (@{$config{wrappers}}) {
-				%config=(%origconfig, %{$wrapper});
-				$config{verbose}=$config{setupverbose}
-					if exists $config{setupverbose};
-				$config{syslog}=$config{setupsyslog}
-					if exists $config{setupsyslog};
-				delete @config{qw(setupsyslog setupverbose wrappers genwrappers rebuild)};
-				checkconfig();
-				if (! $config{cgi} && ! $config{post_commit} &&
-				    ! $config{test_receive}) {
-					$config{post_commit}=1;
-				}
-				gen_wrapper();
-			}
-			%config=(%origconfig);
+			gen_wrappers();
 		}
 		
 		# setup implies a wiki rebuild by default