Get rid of wrapper scripts in the container

container/Dockerfile

@@ -88,8 +88,7 @@ RUN \
     chmod +x /usr/local/bin/pdftk
 
 COPY dangerzone.py /usr/local/bin/
-COPY document-to-pixels /usr/local/bin/
+RUN chmod +x /usr/local/bin/dangerzone.py
-COPY pixels-to-pdf /usr/local/bin/
 
 # Add the unprivileged user
 RUN adduser -h /home/user -s /bin/sh -D user

container/dangerzone.py

@@ -17,6 +17,7 @@ import subprocess
 import glob
 import os
 import json
+import shutil
 
 import magic
 from PIL import Image
@@ -300,6 +301,15 @@ class DangerzoneConverter:
             "Converted document to pixels",
             percentage,
         )
+
+        # Move converted files into /dangerzone
+        for filename in (
+            glob.glob("/tmp/page-*.rgb")
+            + glob.glob("/tmp/page-*.width")
+            + glob.glob("/tmp/page-*.height")
+        ):
+            shutil.move(filename, "/dangerzone")
+
         return 0
 
     def pixels_to_pdf(self):
@@ -500,6 +510,10 @@ class DangerzoneConverter:
         percentage = 100.0
         self.output(False, "Safe PDF created", percentage)
 
+        # Move converted files into /safezone
+        shutil.move("/tmp/safe-output.pdf", "/safezone")
+        shutil.move("/tmp/safe-output-compressed.pdf", "/safezone")
+
         return 0
 
     def output(self, error, text, percentage):

container/document-to-pixels

@@ -1,14 +0,0 @@
-#!/bin/sh
-
-# Do the conversion
-/usr/bin/python3 /usr/local/bin/dangerzone.py document-to-pixels
-RETURN_CODE=$?
-if [ $RETURN_CODE -ne 0 ]; then
-    echo ""
-    exit $RETURN_CODE
-fi
-
-# Move converted files into /dangerzone
-/bin/mv /tmp/page-*.rgb /dangerzone
-/bin/mv /tmp/page-*.width /dangerzone
-/bin/mv /tmp/page-*.height /dangerzone

container/pixels-to-pdf

@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# Do the conversion
-OCR=$OCR OCR_LANGUAGE=$OCR_LANGUAGE /usr/bin/python3 /usr/local/bin/dangerzone.py pixels-to-pdf
-RETURN_CODE=$?
-if [ $RETURN_CODE -ne 0 ]; then
-    echo ""
-    exit $RETURN_CODE
-fi
-
-# Move converted files into /safezone
-/bin/mv /tmp/safe-output.pdf /safezone
-/bin/mv /tmp/safe-output-compressed.pdf /safezone

dangerzone/container.py

@@ -85,6 +85,7 @@ def convert(input_filename, output_filename, ocr_lang, stdout_callback):
         "-v",
         f"{pixel_dir}:/dangerzone",
         container_name,
+        "dangerzone.py",
         "document-to-pixels",
     ]
     ret = exec_container(args, stdout_callback)
@@ -109,6 +110,7 @@ def convert(input_filename, output_filename, ocr_lang, stdout_callback):
             "-e",
             f"OCR_LANGUAGE={ocr_lang}",
             container_name,
+            "dangerzone.py",
             "pixels-to-pdf",
         ]
         ret = exec_container(args, stdout_callback)