X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=graphics%2Fupdate;h=35aec325a78bb0f279f5b988804a65ca713038b5;hp=5fc7aa519bf35b64968520e8b6d81e88e5744f71;hb=2d4e8c5f69cc694625ad95dcee554499605f823b;hpb=ad44531cdd4e6d8ce77822e6b06a43d19979aae9

diff --git a/graphics/update b/graphics/update
index 5fc7aa519..35aec325a 100755
--- a/graphics/update
+++ b/graphics/update
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 #
 # Update generated stuff in graphics/ from the source files.
 #
@@ -6,6 +6,8 @@
 # a) getting the wscript right is a complete pain in the arse
 # b) running Inkscape from the command line on OS X is a complete pain in the arse
 
+set -e
+
 pwd=`pwd`
 if [ `basename $pwd` != "graphics" ]; then
     echo "$0: run within graphics/"
@@ -14,15 +16,16 @@ fi
 
 function required_font()
 {
+    set +e
     check=$(fc-list | grep "$1")
+    set -e
     if [ "$check" == "" ]; then
         echo "Missing font $1"
         exit 1
     fi
 }
 
-svg_apps="dcpomatic2_kdm dcpomatic2_server dcpomatic2_batch dcpomatic2_player dcpomatic2_playlist dcpomatic2_disk"
-required_font "Libre Baskerville"
+svg_apps="dcpomatic2_kdm dcpomatic2_server dcpomatic2_batch dcpomatic2_player dcpomatic2_playlist dcpomatic2_disk dcpomatic2_combiner"
 
 
 if [ `uname -s` == "Darwin" ]; then
@@ -31,15 +34,17 @@ if [ `uname -s` == "Darwin" ]; then
 	iconutil --convert icns --output osx/$p.icns osx/$p.iconset
     done
 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"
+    INKSCAPE_EXPORT="$INKSCAPE -C --export-type=png"
 
     # OS X application icons
     mkdir -p osx
@@ -51,8 +56,8 @@ else
 	done
 	for p in $svg_apps; do
 	    mkdir -p osx/$p.iconset
-	    $INKSCAPE --export-filename=osx/$p.iconset/icon_${r}x${r}.png -w $r -h $r src/$p.svg
-	    $INKSCAPE --export-filename=osx/$p.iconset/icon_${r}x${r}@2x.png -w $r -h $r src/$p.svg
+	    $INKSCAPE_EXPORT --export-filename=osx/$p.iconset/icon_${r}x${r}.png -w $r -h $r src/$p.svg
+	    $INKSCAPE_EXPORT --export-filename=osx/$p.iconset/icon_${r}x${r}@2x.png -w $r -h $r src/$p.svg
 	done
     done
 
@@ -62,7 +67,7 @@ else
 	mkdir -p linux/$r
 	convert src/dcpomatic.png -resize $rx$r linux/$r/dcpomatic2.png
 	for p in $svg_apps; do
-	    $INKSCAPE --export-filename=linux/$r/$p.png src/$p.svg -w $r -h $r
+	    $INKSCAPE_EXPORT --export-filename=linux/$r/$p.png src/$p.svg -w $r -h $r
 	done
     done
 
@@ -76,27 +81,28 @@ else
     # OS X preferences icons
     mkdir -p osx/preferences
     for i in defaults email kdm_email cover_sheet keys tms notifications locations sound identifiers servers general advanced; do
-        inkbatch -i bounds-$i -o osx/preferences/$i.png --width 32 --height 32 src/preferences.svg
-        inkbatch -i bounds-$i -o osx/preferences/$i@2x.png --width 64 --height 64 src/preferences.svg
+        inkbatch --inkscape $INKSCAPE -i bounds-$i -o osx/preferences/$i.png --width 32 --height 32 src/preferences.svg
+        inkbatch --inkscape $INKSCAPE -i bounds-$i -o osx/preferences/$i@2x.png --width 64 --height 64 src/preferences.svg
     done
 
-    # OS X menu bar icon for the server
-    $INKSCAPE --export-filename=osx/dcpomatic_small.png -w 64 -h 64 src/dcpomatic_small.svg
+    # OS X menu bar icon for the server (in dark and light mode)
+    $INKSCAPE_EXPORT --export-filename=osx/dcpomatic_small_white.png -w 64 -h 64 src/dcpomatic_small_white.svg
+    $INKSCAPE_EXPORT --export-filename=osx/dcpomatic_small_black.png -w 64 -h 64 src/dcpomatic_small_black.svg
 
     # Splash screen (all platforms)
-    $INKSCAPE --export-filename=splash.png src/splash.svg -w 400 -h 300
+    $INKSCAPE_EXPORT --export-filename=splash.png src/splash.svg -w 400 -h 300
 
     # Timeline toolbar icons (all platforms)
     for i in select zoom zoom_all snap sequence; do
-        $INKSCAPE --export-filename=$i.png src/$i.svg -w 32 -h 32
+        $INKSCAPE_EXPORT --export-filename=$i.png src/$i.svg -w 32 -h 32
     done
 
     # Playlist editor tick/no-tick
-    $INKSCAPE --export-filename=tick.png src/tick.svg -w 16 -h 16
-    $INKSCAPE --export-filename=no_tick.png src/no_tick.svg -w 16 -h 16
+    $INKSCAPE_EXPORT --export-filename=tick.png src/tick.svg -w 16 -h 16
+    $INKSCAPE_EXPORT --export-filename=no_tick.png src/no_tick.svg -w 16 -h 16
 
     # Link icon
-    $INKSCAPE --export-filename=link.png src/link.svg -w 9 -h 16
+    $INKSCAPE_EXPORT --export-filename=link.png src/link.svg -w 9 -h 16
 
     # favicon
     mkdir -p web