Fix checking for inkscape binary.

[dcpomatic.git] / graphics / update

diff --git a/graphics/update b/graphics/update
index 0628a7c8b4ce5ee1a79d8528dd8c505412ec1176..464a3a068b0b6a2cc819b7c1a5b0bf4c92d018fb 100755 (executable)
--- a/graphics/update
+++ b/graphics/update
@@ -16,7 +16,9 @@ fi
 
 function required_font()
 {
+    set +e
     check=$(fc-list | grep "$1")
+    set -e
     if [ "$check" == "" ]; then
         echo "Missing font $1"
         exit 1
@@ -34,14 +36,14 @@ if [ `uname -s` == "Darwin" ]; then
 else
     required_font "Libre Baskerville"
 
-    for c in icotool convert inkscape inkbatch; do
+    INKSCAPE="$HOME/Applications/inkscape"
+    for c in icotool convert inkbatch $INKSCAPE; do
         if [ ! -x "$(command -v $c)" ]; then
             echo "$c is required"
             exit 1
         fi
     done
 
-    INKSCAPE="inkscape -C --export-type=png"
 
     # OS X application icons
     mkdir -p osx