X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/ffb40f2f354954634cdd554071e60ef3650b3010..788d61bfe0b595669b6c8fd832ec6b7044520563:/mr diff --git a/mr b/mr index 87acef3..d8a27b2 100755 --- a/mr +++ b/mr @@ -586,7 +586,7 @@ my $no_chdir=0; my $jobs=1; my $trust_all=0; my $directory=getcwd(); -my $terminal=-t STDOUT && eval{require IO::Pty::Easy;IO::Pty::Easy->import();1;} eq 1; +my $terminal=-t STDOUT && eval{require IO::Pty::Easy;IO::Pty::Easy->import();1;}; my $HOME_MR_CONFIG = "$ENV{HOME}/.mrconfig"; $ENV{MR_CONFIG}=find_mrconfig(); @@ -853,7 +853,7 @@ sub action { } print "$actionmsg\n" unless $quiet || $minimal; - my $hookret=hook("pre_$action", $topdir, $subdir); + my ($hookret, $hook_out)=hook("pre_$action", $topdir, $subdir); return $hookret if $hookret != OK; my ($ret, $out)=runsh $action, $topdir, $subdir, @@ -908,7 +908,7 @@ sub action { return FAILED; } } - my $ret=hook("fixups", $topdir, $subdir); + my ($ret, $hook_out)=hook("fixups", $topdir, $subdir); return $ret if $ret != OK; }