Make "raw" option override "json-translate"

zonemaster · May 31, 2023 · 564830d · 564830d
1 parent d20173f
commit 564830d
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/Zonemaster/CLI.pm b/lib/Zonemaster/CLI.pm
@@ -389,8 +389,10 @@ sub run {
 
     # align values
     $self->json( 1 ) if $self->json_stream;
-    $self->raw( 0 ) if $self->json_translate; # deprecated
-    $self->raw( 1 ) if ( not $self->json_translate and grep(/^--no-json[_-]translate$/, @{$self->ARGV}) ); # deprecated
+    if ( not grep {/^--raw$/ || /^--no-raw$/} @{$self->ARGV} ) {
+        $self->raw( 0 ) if $self->json_translate;
+        $self->raw( 1 ) if ( not $self->json_translate and grep(/^--no-json[_-]translate$/, @{$self->ARGV}) );
+    }
 
     # Filehandle for diagnostics output
     my $fh_diag = ( $self->json or $self->raw )