3824: Use Data::Dumper instead of custom quoting to show srun/task exec args.

[arvados.git] / sdk / cli / bin / crunch-job

diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index 1ebe74668264cab2e8ae1327cd802dfb1f298eca..1a836f643f544f1fec294cc932230b7357ab809e 100755 (executable)
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@ -86,6 +86,7 @@ use POSIX ':sys_wait_h';
 use POSIX qw(strftime);
 use Fcntl qw(F_GETFL F_SETFL O_NONBLOCK);
 use Arvados;
+use Data::Dumper;
 use Digest::MD5 qw(md5_hex);
 use Getopt::Long;
 use IPC::Open2;
@@ -1570,14 +1571,10 @@ sub srun
   my $stdin = shift;
   my $args = $have_slurm ? [@$srunargs, @$execargs] : $execargs;
 
-  my $show_cmd = join(" ", map {
-    if (/[\s\"]/) {
-      s/[\"\$\\]/\\$&/g;
-      "\"$_\"";
-    } else {
-      $_;
-    }} @{$args});
-  $show_cmd =~ s/(TOKEN\\*=)\S+/${1}[...]/g;
+  $Data::Dumper::Terse = 1;
+  $Data::Dumper::Indent = 0;
+  my $show_cmd = Dumper($args);
+  $show_cmd =~ s/(TOKEN\\*=)[^\s\']+/${1}[...]/g;
   $show_cmd =~ s/\n/ /g;
   warn "starting: $show_cmd\n";