update for rename of recentchanges.mdwn to json.tl.ph.mdwn

[git.ikiwiki.info.git] / IkiWiki / Wrapper.pm

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index a8de39eea13b7d6ac83be34e4c7735b9ca9f5478..1b8c558e5a46ae55aa14be4f09e59ef5ad5a504b 100644 (file)
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -52,6 +52,8 @@ sub gen_wrapper () {
                       HTTP_COOKIE REMOTE_USER HTTPS REDIRECT_STATUS
                       HTTP_HOST SERVER_PORT HTTPS HTTP_ACCEPT
                       REDIRECT_URL} if $config{cgi};
                       HTTP_COOKIE REMOTE_USER HTTPS REDIRECT_STATUS
                       HTTP_HOST SERVER_PORT HTTPS HTTP_ACCEPT
                       REDIRECT_URL} if $config{cgi};

+       push @envsave, qw{GIT_OBJECT_DIRECTORY GIT_QUARANTINE_PATH
+                      GIT_ALTERNATE_OBJECT_DIRECTORIES} if $config{test_receive};

        my $envsave="";
        foreach my $var (@envsave) {
                $envsave.=<<"EOF";
        my $envsave="";
        foreach my $var (@envsave) {
                $envsave.=<<"EOF";


@@ -160,7 +162,7 @@ EOF
        if (defined $config{wrapper_background_command} &&
            length $config{wrapper_background_command}) {
                my $background_command=delete $config{wrapper_background_command};
        if (defined $config{wrapper_background_command} &&
            length $config{wrapper_background_command}) {
                my $background_command=delete $config{wrapper_background_command};

-               $set_background_command=~s/"/\\"/g;
+               $background_command=~s/"/\\"/g;

                $set_background_command='#define BACKGROUND_COMMAND "'.$background_command.'"';
        }
 
                $set_background_command='#define BACKGROUND_COMMAND "'.$background_command.'"';
        }
 


@@ -180,6 +182,7 @@ EOF
 #include <stdlib.h>
 #include <string.h>
 #include <sys/file.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/file.h>

+#include <sys/wait.h>

 
 extern char **environ;
 int newenvironlen=0;
 
 extern char **environ;
 int newenvironlen=0;