diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-10-09 08:37:12 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-10-09 08:37:12 +0100 |
commit | d51d076759bf65a31b74829e9afce28353b2379b (patch) | |
tree | 23a084aac00bef9b5726d37897aca4370aba5932 /dgit | |
parent | c8a91e6973d6fc51c83eb200dfeee6aa762373de (diff) |
finish support and docs for DGIT_SSH etc. config
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 35 |
1 files changed, 30 insertions, 5 deletions
@@ -55,7 +55,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); @@ -447,6 +447,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 +556,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 +564,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 +645,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 +660,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 +1687,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; |