Fix disk_writer perms in .deb files (#1994).

2 files changed, 6 insertions, 12 deletions

diff --git a/debian/rules b/debian/rules
index 9f39f6b00..2a2a53639 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,5 +49,5 @@ override_dh_shlibdeps:
 	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
 
 override_dh_fixperms:
-	dh_fixperms --exclude usr/bin/dcpomatic2_uuid
-	dh_fixperms --exclude usr/bin/dcpomatic2_disk_writer
+	dh_fixperms
+	chmod 4755 debian/dcpomatic/usr/bin/dcpomatic2_disk_writer
diff --git a/wscript b/wscript
index c0b14cbf6..b7ea7de6c 100644
--- a/wscript
+++ b/wscript
@@ -666,16 +666,10 @@ def create_version_cc(version, cxx_flags):
 def post(ctx):
     if ctx.cmd == 'install' and ctx.env.TARGET_LINUX:
         ctx.exec_command('/sbin/ldconfig')
-        # setuid root executables
-        for e in ['dcpomatic2_uuid', 'dcpomatic2_disk_writer']:
-            # I can't find anything which tells me where things have been installed to,
-            # so here's some nasty hacks to guess.
-            debian = os.path.join(ctx.out_dir, '../debian/dcpomatic/usr/bin/%s' % e)
-            prefix = os.path.join(ctx.env['INSTALL_PREFIX'], 'bin/%s' % e)
-            if os.path.exists(debian):
-                os.chmod(debian, 0o4755)
-            if os.path.exists(prefix):
-                os.chmod(prefix, 0o4755)
+        # setuid root executable
+        exe = os.path.join(ctx.env['INSTALL_PREFIX'], 'bin/%s/dcpomatic2_disk_writer')
+        if os.path.exists(exe):
+            os.chmod(exe, 0o4755)
 
 def pot(bld):
     bld.recurse('src')