From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 10 May 2020 21:48:48 +0000 (+0100)
Subject: nailing-cargo: oot rework and message improvements
X-Git-Tag: nailing-cargo/1.0.0~213
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0abca44b3fee96face9a1e5df3572a8682c76597;p=nailing-cargo.git

nailing-cargo: oot rework and message improvements

No significant functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/nailing-cargo b/nailing-cargo
index 327b252..df034e0 100755
--- a/nailing-cargo
+++ b/nailing-cargo
@@ -384,10 +384,15 @@ END
     my $user = $getuser->();
     $user .= '@localhost' unless $user =~ m/\@/;
     $command_sh->('ssh',$user);
-  } elsif ($use eq 'command_sh') {
-    $command_sh->(cfgn_list qw(oot command));
+    print STDERR "$self: using ssh to run as \`$user'\n" if $verbose;
   } elsif ($use eq 'command_args') {
-    $sh_ec->(cfgn_list qw(oot command))
+    my @c = cfgn_list qw(oot command);
+    $sh_ec->(@c);
+    print STDERR "$self: out-of-tree, adverbial command: @c\n" if $verbose;
+  } elsif ($use eq 'command_sh') {
+    my @c = cfgn_list qw(oot command);
+    $command_sh->(@c);
+    print STDERR "$self: out-of-tree, ssh'ish command: @c\n" if $verbose;
   } else {
     die "$self: oot.use mode $use not recognised\n";
   }
@@ -532,7 +537,6 @@ printf STDERR "$self: nailed (%s manifests, %s packages)\n",
   (scalar keys %manifests), (scalar keys %packagemap)
   if $verbose;
 
-print STDERR "$self: invoking: @display_cmd\n" if $verbose;
 my $estatus = invoke();
 
 uninstall();