From e7f5ce0c38f48c26ced9674903cbdf577aad5ce9 Mon Sep 17 00:00:00 2001
From: Micah Lee <micah@micahflee.com>
Date: Thu, 27 Feb 2020 15:21:30 -0800
Subject: [PATCH] Remove git submodule, and all references to the container

---
 .gitmodules                          |  3 ---
 BUILD.md                             |  7 -------
 RELEASE.md                           |  4 +---
 install/pyinstaller/pyinstaller.spec |  2 +-
 install/windows/Dangerzone.wxs       | 23 +----------------------
 setup.py                             |  2 --
 share/container                      |  1 -
 7 files changed, 3 insertions(+), 39 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 160000 share/container

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 05a4e6c..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "share/container"]
-	path = share/container
-	url = git@github.com:firstlookmedia/dangerzone-converter.git
diff --git a/BUILD.md b/BUILD.md
index 6170dd3..3e0e105 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -1,12 +1,5 @@
 # Development environment
 
-After cloning this git repo, make sure to checkout the git submodules.
-
-```
-git submodule init
-git submodule update
-```
-
 ## Debian/Ubuntu
 
 Install dependencies:
diff --git a/RELEASE.md b/RELEASE.md
index d6b118a..360eaeb 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -18,12 +18,10 @@ git fetch
 git tag -v v$VERSION
 ```
 
-If the tag verifies successfully, check it out, and also its submodules:
+If the tag verifies successfully and check it out:
 
 ```
 git checkout v$VERSION
-git submodule init
-git submodule update
 ```
 
 ## macOS release
diff --git a/install/pyinstaller/pyinstaller.spec b/install/pyinstaller/pyinstaller.spec
index e4f223c..41c6629 100644
--- a/install/pyinstaller/pyinstaller.spec
+++ b/install/pyinstaller/pyinstaller.spec
@@ -16,7 +16,7 @@ sys.path.insert(0, root)
 import dangerzone
 
 version = dangerzone.dangerzone_version
-print("Flock Agent version: {}".format(version))
+print("Dangerzone version: {}".format(version))
 
 if p == "Darwin":
     datas = [("../../share", "share"), ("../macos/../macos/document.icns", ".")]
diff --git a/install/windows/Dangerzone.wxs b/install/windows/Dangerzone.wxs
index 26c6310..af01865 100644
--- a/install/windows/Dangerzone.wxs
+++ b/install/windows/Dangerzone.wxs
@@ -40,11 +40,7 @@
                             <Directory Id="FolderPyQt5QtTranslations" Name="translations" />
                         </Directory>
                     </Directory>
-                    <Directory Id="FolderShare" Name="share">
-                        <Directory Id="FolderShareContainer" Name="container">
-                            <Directory Id="FolderShareContainerScripts" Name="scripts" />
-                        </Directory>
-                    </Directory>
+                    <Directory Id="FolderShare" Name="share" />
                     <Directory Id="FolderWin32com" Name="win32com">
                         <Directory Id="FolderWin32comShell" Name="shell" />
                     </Directory>
@@ -202,23 +198,6 @@
             </Component>
         </DirectoryRef>
 
-        <DirectoryRef Id="FolderShareContainer">
-            <Component Id="FolderComponentShareContainer" Guid="4a3e5a58-8804-40eb-8216-5f0d75e8afa2">
-                <File Source="..\..\dist\dangerzone\share\container\Dockerfile" />
-                <File Source="..\..\dist\dangerzone\share\container\LICENSE" />
-                <File Source="..\..\dist\dangerzone\share\container\README.md" />
-            </Component>
-        </DirectoryRef>
-
-        <DirectoryRef Id="FolderShareContainerScripts">
-            <Component Id="FolderComponentShareContainerScripts" Guid="863a148f-b0cd-404f-ab59-fc29d5961786">
-                <File Source="..\..\dist\dangerzone\share\container\scripts\document-to-pixels" />
-                <File Source="..\..\dist\dangerzone\share\container\scripts\document-to-pixels-unpriv" />
-                <File Source="..\..\dist\dangerzone\share\container\scripts\pixels-to-pdf" />
-                <File Source="..\..\dist\dangerzone\share\container\scripts\pixels-to-pdf-unpriv" />
-            </Component>
-        </DirectoryRef>
-
         <DirectoryRef Id="FolderWin32comShell">
             <Component Id="FolderComponentWin32comShell" Guid="b51f7768-64f2-4666-a919-736a6ae6c332">
                 <File Source="..\..\dist\dangerzone\win32com\shell\shell.pyd" />
diff --git a/setup.py b/setup.py
index cb51b09..3fe975d 100644
--- a/setup.py
+++ b/setup.py
@@ -29,8 +29,6 @@ setuptools.setup(
             ["install/linux/media.firstlook.dangerzone.png"],
         ),
         ("share/dangerzone", file_list("share")),
-        ("share/dangerzone/container", file_list("share/container")),
-        ("share/dangerzone/container/scripts", file_list("share/container/scripts")),
     ],
     classifiers=[
         "Programming Language :: Python",
diff --git a/share/container b/share/container
deleted file mode 160000
index 9de7f4c..0000000
--- a/share/container
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9de7f4cd81e71df0dcea4c4f9a76bee6a27cb234