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 327b25282addccbb70c5990c5719c1815f10ba82..df034e037eabfb9a2e783c4238dd4bbf2e144f99 100755 (executable)
--- 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();