X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=misc%2Ftranslator%2Ftmpl_process3.pl;h=89c993f672ad230de0aebbdb692e82b62fd772fb;hb=d029ec835d31c83322ef2e4de31bc597c2deb496;hp=ec241c6f17eba707e006853d73908dac2c3904db;hpb=0fbc036392c0be81814e34ec1e38d046fea49166;p=srvgit

diff --git a/misc/translator/tmpl_process3.pl b/misc/translator/tmpl_process3.pl
index ec241c6f17..89c993f672 100755
--- a/misc/translator/tmpl_process3.pl
+++ b/misc/translator/tmpl_process3.pl
@@ -12,6 +12,7 @@ using gettext-compatible translation files
 =cut
 
 use strict;
+#use warnings; FIXME - Bug 2505
 use Getopt::Long;
 use Locale::PO;
 use File::Temp qw( :POSIX );
@@ -20,12 +21,12 @@ use VerboseWarnings qw( :warn :die );
 
 ###############################################################################
 
-use vars qw( @in_files $in_dir $str_file $out_dir );
+use vars qw( @in_files $in_dir $str_file $out_dir $quiet );
 use vars qw( @excludes $exclude_regex );
 use vars qw( $recursive_p );
 use vars qw( $pedantic_p );
 use vars qw( $href );
-use vars qw( $type );	# file extension (DOS form without the dot) to match
+use vars qw( $type );   # file extension (DOS form without the dot) to match
 use vars qw( $charset_in $charset_out );
 
 ###############################################################################
@@ -34,48 +35,63 @@ sub find_translation ($) {
     my($s) = @_;
     my $key = $s;
     if ($s =~ /\S/s) {
-	$key = TmplTokenizer::string_canon($key);
-	$key = TmplTokenizer::charset_convert($key, $charset_in, $charset_out);
-	$key = TmplTokenizer::quote_po($key);
+      $key = TmplTokenizer::string_canon($key);
+      $key = TmplTokenizer::charset_convert($key, $charset_in, $charset_out);
+      $key = TmplTokenizer::quote_po($key);
+    }
+    if (defined $href->{$key} && !$href->{$key}->fuzzy && length Locale::PO->dequote($href->{$key}->msgstr)){
+	if ($s =~ /^(\s+)/){
+	    return $1 . Locale::PO->dequote($href->{$key}->msgstr);
+	}
+	else {
+	    return Locale::PO->dequote($href->{$key}->msgstr);
+	}
+    }
+    else {
+	return $s;
     }
-    return defined $href->{$key}
-		&& !$href->{$key}->fuzzy
-		&& length Locale::PO->dequote($href->{$key}->msgstr)?
-	   Locale::PO->dequote($href->{$key}->msgstr): $s;
 }
 
 sub text_replace_tag ($$) {
     my($t, $attr) = @_;
     my $it;
+
     # value [tag=input], meta
     my $tag = lc($1) if $t =~ /^<(\S+)/s;
     my $translated_p = 0;
-    for my $a ('alt', 'content', 'title', 'value') {
-	if ($attr->{$a}) {
-	    next if $a eq 'content' && $tag ne 'meta';
-	    next if $a eq 'value' && ($tag ne 'input'
-		|| (ref $attr->{'type'} && $attr->{'type'}->[1] =~ /^(?:hidden|radio|text)$/)); # FIXME
-	    my($key, $val, $val_orig, $order) = @{$attr->{$a}}; #FIXME
-	    if ($val =~ /\S/s) {
-		my $s = find_translation($val);
-		if ($attr->{$a}->[1] ne $s) { #FIXME
-		    $attr->{$a}->[1] = $s; # FIXME
-		    $attr->{$a}->[2] = ($s =~ /"/s)? "'$s'": "\"$s\""; #FIXME
-		    $translated_p = 1;
-		}
-	    }
-	}
+    for my $a ('alt', 'content', 'title', 'value','label') {
+    if ($attr->{$a}) {
+        next if $a eq 'label' && $tag ne 'optgroup';
+        next if $a eq 'content' && $tag ne 'meta';
+        next if $a eq 'value' && ($tag ne 'input' || (ref $attr->{'type'} && $attr->{'type'}->[1] =~ /^(?:checkbox|hidden|radio|text)$/)); # FIXME
+
+        my($key, $val, $val_orig, $order) = @{$attr->{$a}}; #FIXME
+        if ($val =~ /\S/s) {
+        my $s = find_translation($val);
+        if ($attr->{$a}->[1] ne $s) { #FIXME
+            $attr->{$a}->[1] = $s; # FIXME
+            $attr->{$a}->[2] = ($s =~ /"/s)? "'$s'": "\"$s\""; #FIXME
+            $translated_p = 1;
+        }
+        }
+    }
     }
     if ($translated_p) {
-	$it = "<$tag"
-	    . join('', map {
-		    sprintf(' %s=%s', $_, $attr->{$_}->[2]) #FIXME
-		} sort {
-		    $attr->{$a}->[3] <=> $attr->{$b}->[3] #FIXME
-		} keys %$attr)
-	    . '>';
-    } else {
-	$it = $t;
+     $it = "<$tag"
+          . join('', map { if ($_ ne '/'){
+                             sprintf(' %s="%s"', $_, $attr->{$_}->[1]);
+          }
+              else {
+                  sprintf(' %s',$_);
+                  }
+                         
+              } sort {
+                  $attr->{$a}->[3] <=> $attr->{$b}->[3] #FIXME
+              } keys %$attr);
+        $it .= '>';
+    }
+    else {
+        $it = $t;
     }
     return $it;
 }
@@ -83,55 +99,57 @@ sub text_replace_tag ($$) {
 sub text_replace (**) {
     my($h, $output) = @_;
     for (;;) {
-	my $s = TmplTokenizer::next_token $h;
+    my $s = TmplTokenizer::next_token $h;
     last unless defined $s;
-	my($kind, $t, $attr) = ($s->type, $s->string, $s->attributes);
-	if ($kind eq TmplTokenType::TEXT) {
-	    print $output find_translation($t);
-	} elsif ($kind eq TmplTokenType::TEXT_PARAMETRIZED) {
-	    my $fmt = find_translation($s->form);
-	    print $output TmplTokenizer::parametrize($fmt, 1, $s, sub {
-		$_ = $_[0];
-		my($kind, $t, $attr) = ($_->type, $_->string, $_->attributes);
-		$kind == TmplTokenType::TAG && %$attr?
-		    text_replace_tag($t, $attr): $t });
-	} elsif ($kind eq TmplTokenType::TAG && %$attr) {
-	    print $output text_replace_tag($t, $attr);
-	} elsif ($s->has_js_data) {
-	    for my $t (@{$s->js_data}) {
-		# FIXME for this whole block
-		if ($t->[0]) {
-		    printf $output "%s%s%s", $t->[2], find_translation $t->[3],
-			    $t->[2];
-		} else {
-		    print $output $t->[1];
-		}
-	    }
-	} elsif (defined $t) {
-	    print $output $t;
-	}
+    my($kind, $t, $attr) = ($s->type, $s->string, $s->attributes);
+    if ($kind eq C4::TmplTokenType::TEXT) {
+        print $output find_translation($t);
+    } elsif ($kind eq C4::TmplTokenType::TEXT_PARAMETRIZED) {
+        my $fmt = find_translation($s->form);
+        print $output TmplTokenizer::parametrize($fmt, 1, $s, sub {
+        $_ = $_[0];
+        my($kind, $t, $attr) = ($_->type, $_->string, $_->attributes);
+        $kind == C4::TmplTokenType::TAG && %$attr?
+            text_replace_tag($t, $attr): $t });
+    } elsif ($kind eq C4::TmplTokenType::TAG && %$attr) {
+        print $output text_replace_tag($t, $attr);
+    } elsif ($s->has_js_data) {
+        for my $t (@{$s->js_data}) {
+        # FIXME for this whole block
+        if ($t->[0]) {
+            printf $output "%s%s%s", $t->[2], find_translation $t->[3],
+                $t->[2];
+        } else {
+            print $output $t->[1];
+        }
+        }
+    } elsif (defined $t) {
+        # Quick fix to bug 4472
+        $t = "<!DOCTYPE stylesheet ["  if $t =~ /DOCTYPE stylesheet/ ;
+        print $output $t;
+    }
     }
 }
 
-sub listfiles ($$) {
-    my($dir, $type) = @_;
+sub listfiles ($$$) {
+    my($dir, $type, $action) = @_;
     my @it = ();
     if (opendir(DIR, $dir)) {
-	my @dirent = readdir DIR;	# because DIR is shared when recursing
-	closedir DIR;
-	for my $dirent (@dirent) {
-	    my $path = "$dir/$dirent";
-	    if ($dirent =~ /^\./ || $dirent eq 'CVS' || $dirent eq 'RCS'
-	    || (defined $exclude_regex && $dirent =~ /^(?:$exclude_regex)$/)) {
-		;
-	    } elsif (-f $path) {
-		push @it, $path if !defined $type || $dirent =~ /\.(?:$type)$/;
-	    } elsif (-d $path && $recursive_p) {
-		push @it, listfiles($path, $type);
-	    }
-	}
+    my @dirent = readdir DIR;   # because DIR is shared when recursing
+    closedir DIR;
+    for my $dirent (@dirent) {
+        my $path = "$dir/$dirent";
+        if ($dirent =~ /^\./ || $dirent eq 'CVS' || $dirent eq 'RCS'
+        || (defined $exclude_regex && $dirent =~ /^(?:$exclude_regex)$/)) {
+        ;
+        } elsif (-f $path) {
+        push @it, $path if (!defined $type || $dirent =~ /\.(?:$type)$/) || $action eq 'install';
+        } elsif (-d $path && $recursive_p) {
+        push @it, listfiles($path, $type, $action);
+        }
+    }
     } else {
-	warn_normal "$dir: $!", undef;
+    warn_normal "$dir: $!", undef;
     }
     return @it;
 }
@@ -145,9 +163,9 @@ sub mkdir_recursive ($) {
     my ($prefix, $basename) = ($dir =~ /\/([^\/]+)$/s)? ($`, $1): ('.', $dir);
     mkdir_recursive($prefix) if $prefix ne '.' && !-d $prefix;
     if (!-d $dir) {
-	print STDERR "Making directory $dir...";
-	# creates with rwxrwxr-x permissions
-	mkdir($dir, 0775) || warn_normal "$dir: $!", undef;
+    print STDERR "Making directory $dir..." unless $quiet;
+    # creates with rwxrwxr-x permissions
+    mkdir($dir, 0775) || warn_normal "$dir: $!", undef;
     }
 }
 
@@ -173,33 +191,35 @@ Create or update PO files from templates, or install translated templates.
                               for input (install) or output (create, update)
   -x, --exclude=REGEXP        Exclude files matching the given REGEXP
       --help                  Display this help and exit
+  -q, --quiet                 no output to screen (except for errors)
 
 The -o option is ignored for the "create" and "update" actions.
-Try `perldoc $0' for perhaps more information.
+Try `perldoc $0 for perhaps more information.
 EOF
     exit($exitcode);
-}
+}#`
 
 ###############################################################################
 
 sub usage_error (;$) {
     for my $msg (split(/\n/, $_[0])) {
-	print STDERR "$msg\n";
+    print STDERR "$msg\n";
     }
-    print STDERR "Try `$0 --help' for more information.\n";
+    print STDERR "Try `$0 --help for more information.\n";
     exit(-1);
 }
 
 ###############################################################################
 
 GetOptions(
-    'input|i=s'				=> \@in_files,
-    'outputdir|o=s'			=> \$out_dir,
-    'recursive|r'			=> \$recursive_p,
-    'str-file|s=s'			=> \$str_file,
-    'exclude|x=s'			=> \@excludes,
-    'pedantic-warnings|pedantic'	=> sub { $pedantic_p = 1 },
-    'help'				=> \&usage,
+    'input|i=s'             => \@in_files,
+    'outputdir|o=s'         => \$out_dir,
+    'recursive|r'           => \$recursive_p,
+    'str-file|s=s'          => \$str_file,
+    'exclude|x=s'           => \@excludes,
+    'quiet|q'               => \$quiet,
+    'pedantic-warnings|pedantic'    => sub { $pedantic_p = 1 },
+    'help'              => \&usage,
 ) || usage_error;
 
 VerboseWarnings::set_application_name $0;
@@ -207,22 +227,22 @@ VerboseWarnings::set_pedantic_mode $pedantic_p;
 
 # keep the buggy Locale::PO quiet if it says stupid things
 $SIG{__WARN__} = sub {
-	my($s) = @_;
-	print STDERR $s unless $s =~ /^Strange line in [^:]+: #~/s
+    my($s) = @_;
+    print STDERR $s unless $s =~ /^Strange line in [^:]+: #~/s
     };
 
 my $action = shift or usage_error('You must specify an ACTION.');
 usage_error('You must at least specify input and string list filenames.')
     if !@in_files || !defined $str_file;
 
-# Type match defaults to *.tmpl plus *.inc if not specified
-$type = "tmpl|inc" if !defined($type);
+# Type match defaults to *.tt plus *.inc if not specified
+$type = "tt|inc|xsl" if !defined($type);
 
 # Check the inputs for being files or directories
 for my $input (@in_files) {
     usage_error("$input: Input must be a file or directory.\n"
-	    . "(Symbolic links are not supported at the moment)")
-	unless -d $input || -f $input;;
+        . "(Symbolic links are not supported at the moment)")
+    unless -d $input || -f $input;;
 }
 
 # Generates the global exclude regular expression
@@ -231,16 +251,16 @@ $exclude_regex =  '(?:'.join('|', @excludes).')' if @excludes;
 # Generate the list of input files if a directory is specified
 if (-d $in_files[0]) {
     die "If you specify a directory as input, you must specify only it.\n"
-	    if @in_files > 1;
+        if @in_files > 1;
 
     # input is a directory, generates list of files to process
     $in_dir = $in_files[0];
     $in_dir =~ s/\/$//; # strips the trailing / if any
-    @in_files = listfiles($in_dir, $type);
+    @in_files = listfiles($in_dir, $type, $action);
 } else {
     for my $input (@in_files) {
-	die "You cannot specify input files and directories at the same time.\n"
-		unless -f $input;
+    die "You cannot specify input files and directories at the same time.\n"
+        unless -f $input;
     }
 }
 
@@ -249,32 +269,52 @@ $href = Locale::PO->load_file_ashash($str_file);
 
 # guess the charsets. HTML::Templates defaults to iso-8859-1
 if (defined $href) {
-    die "$str_file: PO file is corrupted, or not a PO file\n"
-	    unless defined $href->{'""'};
-    $charset_out = TmplTokenizer::charset_canon $2
-	    if $href->{'""'}->msgstr =~ /\bcharset=(["']?)([^;\s"'\\]+)\1/;
-    for my $msgid (keys %$href) {
-	if ($msgid =~ /\bcharset=(["']?)([^;\s"'\\]+)\1/) {
-	    my $candidate = TmplTokenizer::charset_canon $2;
-	    die "Conflicting charsets in msgid: $charset_in vs $candidate\n"
-		    if defined $charset_in && $charset_in ne $candidate;
-	    $charset_in = $candidate;
-	}
+    die "$str_file: PO file is corrupted, or not a PO file\n" unless defined $href->{'""'};
+    $charset_out = TmplTokenizer::charset_canon $2 if $href->{'""'}->msgstr =~ /\bcharset=(["']?)([^;\s"'\\]+)\1/;
+    $charset_in = $charset_out;
+#     for my $msgid (keys %$href) {
+#   if ($msgid =~ /\bcharset=(["']?)([^;\s"'\\]+)\1/) {
+#       my $candidate = TmplTokenizer::charset_canon $2;
+#       die "Conflicting charsets in msgid: $charset_in vs $candidate => $msgid\n"
+#           if defined $charset_in && $charset_in ne $candidate;
+#       $charset_in = $candidate;
+#   }
+#     }
+
+    # BUG6464: check consistency of PO messages
+    #  - count number of '%s' in msgid and msgstr
+    for my $msg ( values %$href ) {
+        my $id_count  = split(/%s/, $msg->{msgid}) - 1;
+        my $str_count = split(/%s/, $msg->{msgstr}) - 1;
+        next if $id_count == $str_count ||
+                $msg->{msgstr} eq '""' ||
+                grep { /fuzzy/ } @{$msg->{_flags}};
+        warn_normal
+            "unconsistent %s count: ($id_count/$str_count):\n" .
+            "  line:   " . $msg->{loaded_line_number} . "\n" .
+            "  msgid:  " . $msg->{msgid} . "\n" .
+            "  msgstr: " . $msg->{msgstr} . "\n", undef;
     }
 }
+
+# set our charset in to UTF-8
 if (!defined $charset_in) {
-    $charset_in = TmplTokenizer::charset_canon 'iso8859-1';
+    $charset_in = TmplTokenizer::charset_canon 'UTF-8';
     warn "Warning: Can't determine original templates' charset, defaulting to $charset_in\n";
 }
-
-my $xgettext = './xgettext.pl';	# actual text extractor script
+# set our charset out to UTF-8
+if (!defined $charset_out) {
+    $charset_out = TmplTokenizer::charset_canon 'UTF-8';
+    warn "Warning: Charset Out defaulting to $charset_out\n";
+}
+my $xgettext = './xgettext.pl'; # actual text extractor script
 my $st;
 
 if ($action eq 'create')  {
     # updates the list. As the list is empty, every entry will be added
     if (!-s $str_file) {
-	warn "Removing empty file $str_file\n";
-	unlink $str_file || die "$str_file: $!\n";
+    warn "Removing empty file $str_file\n";
+    unlink $str_file || die "$str_file: $!\n";
     }
     die "$str_file: Output file already exists\n" if -f $str_file;
     my($tmph1, $tmpfile1) = tmpnam();
@@ -282,33 +322,37 @@ if ($action eq 'create')  {
     close $tmph2; # We just want a name
     # Generate the temporary file that acts as <MODULE>/POTFILES.in
     for my $input (@in_files) {
-	print $tmph1 "$input\n";
+    print $tmph1 "$input\n";
     }
     close $tmph1;
+    warn "I $charset_in O $charset_out";
     # Generate the specified po file ($str_file)
-    $st = system ($xgettext, '-s', '-f', $tmpfile1, '-o', $tmpfile2);
+    $st = system ($xgettext, '-s', '-f', $tmpfile1, '-o', $tmpfile2,
+            (defined $charset_in? ('-I', $charset_in): ()),
+            (defined $charset_out? ('-O', $charset_out): ())
+    );
     # Run msgmerge so that the pot file looks like a real pot file
     # We need to help msgmerge a bit by pre-creating a dummy po file that has
     # the headers and the "" msgid & msgstr. It will fill in the rest.
     if ($st == 0) {
-	# Merge the temporary "pot file" with the specified po file ($str_file)
-	# FIXME: msgmerge(1) is a Unix dependency
-	# FIXME: need to check the return value
-	unless (-f $str_file) {
-	    local(*INPUT, *OUTPUT);
-	    open(INPUT, "<$tmpfile2");
-	    open(OUTPUT, ">$str_file");
-	    while (<INPUT>) {
-		print OUTPUT;
-	    last if /^\n/s;
-	    }
-	    close INPUT;
-	    close OUTPUT;
-	}
-	$st = system('msgmerge', '-U', '-s', $str_file, $tmpfile2);
+    # Merge the temporary "pot file" with the specified po file ($str_file)
+    # FIXME: msgmerge(1) is a Unix dependency
+    # FIXME: need to check the return value
+    unless (-f $str_file) {
+        local(*INPUT, *OUTPUT);
+        open(INPUT, "<$tmpfile2");
+        open(OUTPUT, ">$str_file");
+        while (<INPUT>) {
+        print OUTPUT;
+        last if /^\n/s;
+        }
+        close INPUT;
+        close OUTPUT;
+    }
+    $st = system("msgmerge -U ".($quiet?'-q':'')." -s $str_file $tmpfile2");
     } else {
-	error_normal "Text extraction failed: $xgettext: $!\n", undef;
-	error_additional "Will not run msgmerge\n", undef;
+    error_normal "Text extraction failed: $xgettext: $!\n", undef;
+    error_additional "Will not run msgmerge\n", undef;
     }
 #   unlink $tmpfile1 || warn_normal "$tmpfile1: unlink failed: $!\n", undef;
 #   unlink $tmpfile2 || warn_normal "$tmpfile2: unlink failed: $!\n", undef;
@@ -319,34 +363,34 @@ if ($action eq 'create')  {
     close $tmph2; # We just want a name
     # Generate the temporary file that acts as <MODULE>/POTFILES.in
     for my $input (@in_files) {
-	print $tmph1 "$input\n";
+    print $tmph1 "$input\n";
     }
     close $tmph1;
     # Generate the temporary file that acts as <MODULE>/<LANG>.pot
     $st = system($xgettext, '-s', '-f', $tmpfile1, '-o', $tmpfile2,
-	    '--po-mode',
-	    (defined $charset_in? ('-I', $charset_in): ()),
-	    (defined $charset_out? ('-O', $charset_out): ()));
+        '--po-mode',
+        (defined $charset_in? ('-I', $charset_in): ()),
+        (defined $charset_out? ('-O', $charset_out): ()));
     if ($st == 0) {
-	# Merge the temporary "pot file" with the specified po file ($str_file)
-	# FIXME: msgmerge(1) is a Unix dependency
-	# FIXME: need to check the return value
-	$st = system('msgmerge', '-U', '-s', $str_file, $tmpfile2);
+    # Merge the temporary "pot file" with the specified po file ($str_file)
+    # FIXME: msgmerge(1) is a Unix dependency
+    # FIXME: need to check the return value
+    $st = system("msgmerge -U ".($quiet?'-q':'')." -s $str_file $tmpfile2");
     } else {
-	error_normal "Text extraction failed: $xgettext: $!\n", undef;
-	error_additional "Will not run msgmerge\n", undef;
+    error_normal "Text extraction failed: $xgettext: $!\n", undef;
+    error_additional "Will not run msgmerge\n", undef;
     }
 #   unlink $tmpfile1 || warn_normal "$tmpfile1: unlink failed: $!\n", undef;
 #   unlink $tmpfile2 || warn_normal "$tmpfile2: unlink failed: $!\n", undef;
 
 } elsif ($action eq 'install') {
     if(!defined($out_dir)) {
-	usage_error("You must specify an output directory when using the install method.");
+    usage_error("You must specify an output directory when using the install method.");
     }
-	
+    
     if ($in_dir eq $out_dir) {
-	warn "You must specify a different input and output directory.\n";
-	exit -1;
+    warn "You must specify a different input and output directory.\n";
+    exit -1;
     }
 
     # Make sure the output directory exists
@@ -359,20 +403,29 @@ if ($action eq 'create')  {
 
     # creates the new tmpl file using the new translation
     for my $input (@in_files) {
-	die "Assertion failed"
-		unless substr($input, 0, length($in_dir) + 1) eq "$in_dir/";
-
-	my $h = TmplTokenizer->new( $input );
-	$h->set_allow_cformat( 1 );
-	VerboseWarnings::set_input_file_name $input;
-
-	my $target = $out_dir . substr($input, length($in_dir));
-	my $targetdir = $` if $target =~ /[^\/]+$/s;
-	mkdir_recursive($targetdir) unless -d $targetdir;
-	print STDERR "Creating $target...\n";
-	open( OUTPUT, ">$target" ) || die "$target: $!\n";
-	text_replace( $h, *OUTPUT );
-	close OUTPUT;
+        die "Assertion failed"
+            unless substr($input, 0, length($in_dir) + 1) eq "$in_dir/";
+#       print "$input / $type\n";
+        if (!defined $type || $input =~ /\.(?:$type)$/) {
+            my $h = TmplTokenizer->new( $input );
+            $h->set_allow_cformat( 1 );
+            VerboseWarnings::set_input_file_name $input;
+        
+            my $target = $out_dir . substr($input, length($in_dir));
+            my $targetdir = $` if $target =~ /[^\/]+$/s;
+            mkdir_recursive($targetdir) unless -d $targetdir;
+            print STDERR "Creating $target...\n" unless $quiet;
+            open( OUTPUT, ">$target" ) || die "$target: $!\n";            
+            text_replace( $h, *OUTPUT );
+            close OUTPUT;
+        } else {
+        # just copying the file
+            my $target = $out_dir . substr($input, length($in_dir));
+            my $targetdir = $` if $target =~ /[^\/]+$/s;
+            mkdir_recursive($targetdir) unless -d $targetdir;
+            system("cp -f $input $target");
+            print STDERR "Copying $input...\n" unless $quiet;
+        }
     }
 
 } else {
@@ -380,9 +433,9 @@ if ($action eq 'create')  {
 }
 
 if ($st == 0) {
-    printf "The %s seems to be successful.\n", $action;
+    printf "The %s seems to be successful.\n", $action unless $quiet;
 } else {
-    printf "%s FAILED.\n", "\u$action";
+    printf "%s FAILED.\n", "\u$action" unless $quiet;
 }
 exit 0;