Move code to create KML files to runkml.

2 files changed, 18 insertions, 3 deletions

diff --git a/runcheck b/runcheck
index b3a6828..d67bacb 100755
--- a/runcheck
+++ b/runcheck
@@ -11,7 +11,6 @@ if [ "$1" ] ; then
 fi
 
 if [ ! -d har-data ]; then mkdir har-data ; fi
-if [ ! -d kml-data ]; then mkdir kml-data ; fi
 cat $file | while read url ; do
     case "$url" in
       http*)
@@ -21,11 +20,10 @@ cat $file | while read url ; do
         kmlfile="kml-data/$filename.kml"
         if [ ! -e "$harfile" ] ; then
             echo "info: testing $url"
-            if phantomjs --ssl-protocol any $basedir/netsniff.js "$url" > "$harfile.new" &&
+            if xvfb-run phantomjs --ssl-protocol any $basedir/netsniff.js "$url" > "$harfile.new" &&
               [ -s "$harfile.new" ] &&
               [ "$(jq -r '.log | .entries | map(.request) | map(.url) | join("\n")'  $harfile.new)" ]; then
                 mv "$harfile.new" "$harfile"
-                $basedir/har2kml "$harfile" > $kmlfile
             else
                 echo "error: unable to handle $url"
                 if ! rm "$harfile.new" ; then
diff --git a/runkml b/runkml
new file mode 100755
index 0000000..89a7185
--- /dev/null
+++ b/runkml
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+basedir="$(cd $(dirname $0); pwd)"
+
+set -e
+
+if [ ! -d kml-data ]; then mkdir kml-data ; fi
+
+for harfile in "$@" ; do
+    filename=$(basename $harfile .har)
+    kmlfile="kml-data/$filename.kml"
+    if $basedir/har2kml "$harfile" > $kmlfile.new  ; then
+	mv $kmlfile.new $kmlfile
+    else
+        rm $kmlfile.new
+    fi
+done