Merge branch 'release/0.6'0.6

Conflicts:
	locale/bs/app.po
	locale/ca/app.po
	locale/cs/app.po
	locale/cy/app.po
	locale/de/app.po
	locale/en_IE/app.po
	locale/es/app.po
	locale/eu/app.po
	locale/fr/app.po
	locale/ga_IE/app.po
	locale/gl/app.po
	locale/hu_HU/app.po
	locale/id/app.po
	locale/pt_BR/app.po
	locale/sq/app.po
	locale/sr@latin/app.po
	spec/fixtures/locale/en/app.po

1 files changed, 6 insertions, 7 deletions

diff --git a/script/load-exim-logs b/script/load-exim-logs
index 7e7f37a35..5ca0c66f8 100755
--- a/script/load-exim-logs
+++ b/script/load-exim-logs
@@ -1,21 +1,20 @@
 #!/bin/bash
 
-LOC=`dirname $0`
+LOC=`dirname "$0"`
 
 # Specific file if specified
 if [ x$1 != x ]
 then
-    "$LOC/runner" 'EximLog.load_file("'$1'")'
+    f=`abspath "$1"`
+    cd "$LOC"
+    bundle exec ./runner 'EximLog.load_file("'$f'")'
     exit
 fi
 
 # Load in last three days worth of logs (if they've been modified)
+cd "$LOC"
 LATEST=$( ls /var/log/exim4/exim-mainlog-* 2>/dev/null | sort | tail -3 )
 for X in $LATEST
 do
-    # echo "doing $X"
-    "$LOC/runner" 'EximLog.load_file("'$X'")'
+    bundle exec ./runner 'EximLog.load_file("'$X'")'
 done
-
-
-