X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=graphics%2Fupdate;h=9b75493dbd94a0e5480d92540241f06a2d2ad6f9;hb=a1f7bf2d9e5610075fbd898cdf52f4f8373741f2;hp=642ff7fc0ccb92efd18c7e6fa9421f0890ea262c;hpb=ea61d349a10b053e8acf5b009e51d3aaba0714c6;p=dcpomatic.git

diff --git a/graphics/update b/graphics/update
index 642ff7fc0..9b75493db 100755
--- a/graphics/update
+++ b/graphics/update
@@ -12,19 +12,22 @@ if [ `basename $pwd` != "graphics" ]; then
     exit 1
 fi
 
-for c in icotool convert inkscape; do
-    if [ ! -x "$(command -v $c)" ]; then
-	echo "$c is required"
-	exit 1
-    fi
-done
+svg_apps="dcpomatic2_kdm dcpomatic2_server dcpomatic2_batch dcpomatic2_player dcpomatic2_playlist dcpomatic2_disk"
 
 if [ `uname -s` == "Darwin" ]; then
     # Convert OS X icons using OS X-only iconutil
-    for p in dcpomatic2 dcpomatic2_kdm dcpomatic2_server dcpomatic2_batch dcpomatic2_player dcpomatic2_playlist; do
+    for p in dcpomatic2 $svg_apps; do
 	iconutil --convert icns --output osx/$p.icns osx/$p.iconset
     done
 else
+
+    for c in icotool convert inkscape; do
+        if [ ! -x "$(command -v $c)" ]; then
+            echo "$c is required"
+            exit 1
+        fi
+    done
+
     INKSCAPE="inkscape -z -C -e"
 
     # OS X application icons
@@ -35,7 +38,7 @@ else
 	    convert src/dcpomatic.png -resize $rx$r osx/$p.iconset/icon_${r}x${r}.png
 	    convert src/dcpomatic.png -resize $rx$r osx/$p.iconset/icon_${r}x${r}@2x.png
 	done
-	for p in dcpomatic2_kdm dcpomatic2_server dcpomatic2_batch dcpomatic2_player dcpomatic2_playlist; do
+	for p in $svg_apps; do
 	    mkdir -p osx/$p.iconset
 	    $INKSCAPE osx/$p.iconset/icon_${r}x${r}.png -w $r -h $r src/$p.svg
 	    $INKSCAPE osx/$p.iconset/icon_${r}x${r}@2x.png -w $r -h $r src/$p.svg
@@ -47,14 +50,14 @@ else
     for r in 16 22 32 48 64 128 256 512; do
 	mkdir -p linux/$r
 	convert src/dcpomatic.png -resize $rx$r linux/$r/dcpomatic2.png
-	for p in dcpomatic2_kdm dcpomatic2_server dcpomatic2_batch dcpomatic2_player dcpomatic2_playlist; do
+	for p in $svg_apps; do
 	    $INKSCAPE linux/$r/$p.png src/$p.svg -w $r -h $r
 	done
     done
 
     # Windows application icons
     mkdir -p windows
-    for p in dcpomatic2 dcpomatic2_kdm dcpomatic2_server dcpomatic2_batch dcpomatic2_player dcpomatic2_playlist; do
+    for p in dcpomatic2 $svg_apps; do
 	icotool -c -o windows/$p.ico linux/16/$p.png linux/32/$p.png linux/48/$p.png linux/64/$p.png linux/128/$p.png
     done
     convert src/dcpomatic.png -resize 400x400 windows/dcpomatic.bmp
@@ -62,7 +65,7 @@ else
     # OS X preferences icons
     # servers.png does not have an SVG version
     mkdir -p osx/preferences
-    for i in colour_conversions defaults email kdm_email cover_sheet keys tms notifications accounts locations; do
+    for i in colour_conversions defaults email kdm_email cover_sheet keys tms notifications locations sound; do
 	$INKSCAPE osx/preferences/$i.png src/$i.svg -w 32 -h 32
     done