projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
We only need Libre Baskerville when running update on Linux.
[dcpomatic.git]
/
graphics
/
update
diff --git
a/graphics/update
b/graphics/update
index 5fc7aa519bf35b64968520e8b6d81e88e5744f71..0628a7c8b4ce5ee1a79d8528dd8c505412ec1176 100755
(executable)
--- a/
graphics/update
+++ b/
graphics/update
@@
-1,4
+1,4
@@
-#!/bin/bash
+#!/bin/bash
-e
#
# Update generated stuff in graphics/ from the source files.
#
#
# 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
# 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/"
pwd=`pwd`
if [ `basename $pwd` != "graphics" ]; then
echo "$0: run within graphics/"
@@
-21,8
+23,7
@@
function required_font()
fi
}
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
if [ `uname -s` == "Darwin" ]; then
@@
-31,6
+32,7
@@
if [ `uname -s` == "Darwin" ]; then
iconutil --convert icns --output osx/$p.icns osx/$p.iconset
done
else
iconutil --convert icns --output osx/$p.icns osx/$p.iconset
done
else
+ required_font "Libre Baskerville"
for c in icotool convert inkscape inkbatch; do
if [ ! -x "$(command -v $c)" ]; then
for c in icotool convert inkscape inkbatch; do
if [ ! -x "$(command -v $c)" ]; then