Fix missing _writer binary in disk image.

diff --git a/cscript b/cscript
index af3e87ec73031465c5a9f9ce95361b66741c81d2..a5bf45554b8a62a0c55bb42f2de3c6bf236e9a0b 100644 (file)
--- a/cscript
+++ b/cscript
@@ -642,10 +642,12 @@ def package_rpm(target, cpu, version, options):
 
     return rpms
 
-def make_appimage(target, nice_name, internal_name, version):
+def make_appimage(target, nice_name, internal_name, version, extra_bin=None):
     nice_filename = nice_name.replace(' ', '_')
     os.makedirs('build/%s.AppDir/usr/bin' % nice_filename)
     target.command('cp %s/bin/%s build/%s.AppDir/usr/bin' % (target.directory, internal_name, nice_filename))
+    if extra_bin:
+        target.command('cp %s/bin/%s build/%s.AppDir/usr/bin' % (target.directory, extra_bin, nice_filename))
     target.command('cp %s/src/openssl/apps/openssl build/%s.AppDir/usr/bin/dcpomatic2_openssl' % (target.directory, nice_filename))
     target.command('cp %s/bin/dcpverify build/%s.AppDir/usr/bin/dcpomatic2_verify' % (target.directory, nice_filename))
     target.command('mkdir -p build/%s.AppDir/usr/share/libdcp' % nice_filename)
@@ -687,7 +689,7 @@ def package(target, version, options):
             out.append(make_appimage(target, 'DCP-o-matic KDM Creator', 'dcpomatic2_kdm', version))
             out.append(make_appimage(target, 'DCP-o-matic Batch Converter', 'dcpomatic2_batch', version))
             out.append(make_appimage(target, 'DCP-o-matic Encode Server', 'dcpomatic2_server', version))
-            out.append(make_appimage(target, 'DCP-o-matic Disk Writer', 'dcpomatic2_disk', version))
+            out.append(make_appimage(target, 'DCP-o-matic Disk Writer', 'dcpomatic2_disk', version, "dcpomatic2_disk_writer"))
             out.append(make_appimage(target, 'DCP-o-matic Combiner', 'dcpomatic2_combiner', version))
             return out
         else: