Minor fixes to the updt_embedded_rsc mechanism

Don't add a new newline before __DATA__ (and remove the newlines
accumulated so far); create resources/min/ for temporary files (and add
it to .gitignore); fix a typo.

diff --git a/pgbadger b/pgbadger
index 593508f7c90ca8cf7dba666b1b9f7fcd3146c85c..4e64d4b4c8706827786d9c24c047f26ceb4b17b3 100644 (file)
--- a/pgbadger
+++ b/pgbadger
@@ -14665,21 +14665,6 @@ sub localdie
        exit 1;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 __DATA__
 
 WRFILE: jquery.jqplot.min.css

diff --git a/resources/.gitignore b/resources/.gitignore
new file mode 100644 (file)
index 0000000..4844d17
--- /dev/null
+++ b/resources/.gitignore
@@ -0,0 +1 @@
+min/

diff --git a/resources/README b/resources/README
index c7076eea3a283b453222fd762ba04819d536b87d..dffb7f0a6ed3d9a71ed41339b6a22842defd552b 100644 (file)
--- a/resources/README
+++ b/resources/README
@@ -1,4 +1,4 @@
-Ressources files are collected from their respective download places as follow:
+Resources files are collected from their respective download places as follow:
 
 jqPlot:
 -------

diff --git a/tools/updt_embedded_rsc.pl b/tools/updt_embedded_rsc.pl
index 5a68c3fed479e8d2df0e76e4d7332991906703da..445246528b31e408b4ca4c7d463ec6d610d6eed6 100644 (file)
--- a/tools/updt_embedded_rsc.pl
+++ b/tools/updt_embedded_rsc.pl
@@ -31,6 +31,7 @@ if (!-d $RSC_DIR) {
 `patch -r - -s  -N resources/jquery.jqplot.js -i resources/patch-jquery.jqplot.js`;
 
 # Generate all minified resources files
+mkdir "$RSC_DIR/min";
 foreach my $f (@rsc_list) {
        my $dest = $f;
        $dest =~ s/\.(js|css)$/.min.$1/;
@@ -72,7 +73,7 @@ close(IN);
 # Write script base to destination file
 open(OUT, ">$DEST_TMP_FILE") or die "FATAL: can't write to file $DEST_TMP_FILE, $!\n";
 print OUT $content;
-print OUT "\n__DATA__\n";
+print OUT "__DATA__\n";
 
 # Append each minified resources file
 foreach my $f (@min_rsc_list) {