X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=08ecca6ffcf3175f856a3029020d09671cec735b;hp=3c24c2c1b5ae9a70d3f9a42f0bbcb0ade4f0aefe;hb=b3fb546c9bf124badecfa85a460f64c0c763f895;hpb=c8a91e6973d6fc51c83eb200dfeee6aa762373de

diff --git a/dgit b/dgit
index 3c24c2c1..08ecca6f 100755
--- a/dgit
+++ b/dgit
@@ -28,7 +28,6 @@ use File::Basename;
 use Dpkg::Version;
 use POSIX;
 use IPC::Open2;
-use File::Temp;
 
 our $our_version = 'UNRELEASED'; ###substituted###
 
@@ -55,7 +54,7 @@ our (@dput) = qw(dput);
 our (@debsign) = qw(debsign);
 our (@gpg) = qw(gpg);
 our (@sbuild) = qw(sbuild -A);
-our (@ssh) = qw(ssh);
+our (@ssh) = 'ssh';
 our (@dgit) = qw(dgit);
 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
@@ -172,8 +171,8 @@ sub badproto ($$) {
     fail "protocol violation; $m not expected";
 }
 
-sub protocol_expect ($&) {
-    my ($fh, $match) = @_;
+sub protocol_expect (&$) {
+    my ($match, $fh) = @_;
     local $_;
     $_ = <$fh>;
     defined && chomp or badproto $fh, "eof";
@@ -209,7 +208,7 @@ sub protocol_receive_file ($$) {
     my ($fh, $ourfn) = @_;
     open PF, ">", $ourfn or die "$ourfn: $!";
     for (;;) {
-	protocol_expect \*STDIN, { m/^data-block (.*})$|data-end$/ };
+	protocol_expect { m/^data-block (.*})$|data-end$/ } \*STDIN;
 	length $1 or last;
 	my $d = protocol_read_bytes \*STDIN, $1;
 	print PF $d or die $!;
@@ -240,14 +239,14 @@ sub responder_receive_files ($@) {
     foreach my $fn (@ourfns) {
 	protocol_receive_file \*STDIN, $fn;
     }
-    protocol_expect \*STDIN, { m/^files-end$/ };
+    protocol_expect { m/^files-end$/ } \*STDIN;
 }
 
 #---------- remote protocol support, initiator ----------
 
 sub initiator_expect (&) {
     my ($match) = @_;
-    protocol_expect \*RO, &$match;
+    protocol_expect { &$match } \*RO;
 }
 
 #---------- end remote code ----------
@@ -447,6 +446,24 @@ sub access_cfg (@) {
     return $value;
 }
 
+sub string_to_ssh ($) {
+    my ($spec) = @_;
+    if ($spec =~ m/\s/) {
+	return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
+    } else {
+	return ($spec);
+    }
+}
+
+sub access_cfg_ssh () {
+    my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
+    if (!defined $gitssh) {
+	return @ssh;
+    } else {
+	return string_to_ssh $gitssh;
+    }
+}
+
 sub access_someuserhost ($) {
     my ($some) = @_;
     my $user = access_cfg("$some-user",'username');
@@ -538,7 +555,7 @@ sub archive_query_sshdakls ($$) {
     my ($proto,$data) = @_;
     $data =~ s/:.*// or badcfg "invalid sshdakls method string \`$data'";
     my $dakls = cmdoutput
-	access_cfg('ssh'), $data, qw(dak ls -asource),"-s$isuite",$package;
+	access_cfg_ssh, $data, qw(dak ls -asource),"-s$isuite",$package;
     return madison_parse($dakls);
 }
 
@@ -546,7 +563,7 @@ sub canonicalise_suite_sshdakls ($$) {
     my ($proto,$data) = @_;
     $data =~ m/:/ or badcfg "invalid sshdakls method string \`$data'";
     my @cmd =
-	(access_cfg('ssh'), $`,
+	(access_cfg_ssh, $`,
 	 "set -e; cd $';".
 	 " if test -h $isuite; then readlink $isuite; exit 0; fi;".
 	 " if test -d $isuite; then echo $isuite; exit 0; fi;".
@@ -627,7 +644,7 @@ sub check_for_git () {
     my $how = access_cfg('git-check');
     if ($how eq 'ssh-cmd') {
 	my @cmd =
-	    (access_cfg('ssh'),access_gituserhost(),
+	    (access_cfg_ssh, access_gituserhost(),
 	     " set -e; cd ".access_cfg('git-path').";".
 	     " if test -d $package.git; then echo 1; else echo 0; fi");
 	my $r= cmdoutput @cmd;
@@ -642,7 +659,7 @@ sub create_remote_git_repo () {
     my $how = access_cfg('git-create');
     if ($how eq 'ssh-cmd') {
 	runcmd_ordryrun
-	    (access_cfg('ssh'),access_gituserhost(),
+	    (access_cfg_ssh, access_gituserhost(),
 	     "set -e; cd ".access_cfg('git-path').";".
 	     " cp -a _template $package.git");
     } else {
@@ -1669,6 +1686,13 @@ sub cmd_version {
 
 sub parseopts () {
     my $om;
+
+    if (defined $ENV{'DGIT_SSH'}) {
+	@ssh = string_to_ssh $ENV{'DGIT_SSH'};
+    } elsif (defined $ENV{'GIT_SSH'}) {
+	@ssh = ($ENV{'GIT_SSH'});
+    }
+
     while (@ARGV) {
 	last unless $ARGV[0] =~ m/^-/;
 	$_ = shift @ARGV;