DL CSS change to remove text collisions

[exim-website.git] / script / gen.pl

diff --git a/script/gen.pl b/script/gen.pl
index 16b8f4c3f2650fbaa4a23a46e5a6550311d0e38d..eb61e05d9967646db876689347fc6ba28bd70334 100755 (executable)
--- a/script/gen.pl
+++ b/script/gen.pl
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
 use strict;
 use warnings;
 

-use CSS::Minifier::XS;
+use CSS::Minifier::XS 0.07;

 use File::Copy;
 use File::Find;
 use File::Slurp;
 use File::Copy;
 use File::Find;
 use File::Slurp;


@@ -332,6 +332,14 @@ sub mkdirp {
     }
 }
 
     }
 }
 

+## error_help
+sub error_help {
+    my $msg = shift;
+
+    warn $msg;
+    pod2usage( -exitval => 1, -verbose => 0 );
+}
+

 ## Parse arguments
 sub parse_arguments {
 
 ## Parse arguments
 sub parse_arguments {
 


@@ -348,19 +356,19 @@ sub parse_arguments {
         $opt{$set} = [ map { my $f = File::Spec->rel2abs($_); help( 1, 'No such file: ' . $_ ) unless -f $f; $f } @{ $opt{$set} } ];
     }
     ## --latest
         $opt{$set} = [ map { my $f = File::Spec->rel2abs($_); help( 1, 'No such file: ' . $_ ) unless -f $f; $f } @{ $opt{$set} } ];
     }
     ## --latest

-    help( 1, 'Missing value for latest' ) unless ( exists( $opt{latest} ) && defined( $opt{latest} ) );
-    help( 1, 'Invalid value for latest' ) unless $opt{latest} =~ /^\d+(?:\.\d+)*$/;
+    error_help('Missing value for latest') unless ( exists( $opt{latest} ) && defined( $opt{latest} ) );
+    error_help('Invalid value for latest') unless $opt{latest} =~ /^\d+(?:\.\d+)*$/;

 
     ## --tmpl and --docroot
     foreach my $set (qw[tmpl docroot]) {
 
     ## --tmpl and --docroot
     foreach my $set (qw[tmpl docroot]) {

-        help( 1, 'Missing value for ' . $set ) unless ( exists( $opt{$set} ) && defined( $opt{$set} ) );
+        error_help( 'Missing value for ' . $set ) unless ( exists( $opt{$set} ) && defined( $opt{$set} ) );

         my $f = File::Spec->rel2abs( $opt{$set} );
         my $f = File::Spec->rel2abs( $opt{$set} );

-        help( 1, 'No such directory: ' . $opt{$set} ) unless -d $f;
+        error_help( 'No such directory: ' . $opt{$set} ) unless -d $f;

         $opt{$set} = $f;
     }
         $opt{$set} = $f;
     }

-    help( 1, 'Excess arguments' ) if ( scalar(@ARGV) );
+    error_help('Excess arguments') if ( scalar(@ARGV) );

 
 

-    help( 1, 'Must include at least one of --web, --spec or --filter' )
+    error_help('Must include at least one of --web, --spec or --filter')

       unless ( defined $opt{web} || scalar( @{ $opt{spec} } ) || scalar( @{ $opt{web} } ) );
 
     return %opt;
       unless ( defined $opt{web} || scalar( @{ $opt{spec} } ) || scalar( @{ $opt{web} } ) );
 
     return %opt;