From 8f6659976644cf342a6e91f67db1ed45fed2fa4c Mon Sep 17 00:00:00 2001
From: Ro <ro@freedom.press>
Date: Mon, 26 Feb 2024 19:35:46 -0500
Subject: [PATCH] Use find_packages in setup.py. Use bash for export postrm.

---
 client/setup.py                 | 2 +-
 debian/securedrop-export.postrm | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/client/setup.py b/client/setup.py
index f484b4164..de19a39c8 100644
--- a/client/setup.py
+++ b/client/setup.py
@@ -24,7 +24,7 @@
     install_requires=["SQLAlchemy", "alembic", "securedrop-sdk", "python-dateutil", "arrow"],
     python_requires=">=3.5",
     url="https://github.com/freedomofpress/securedrop-client",
-    packages=["securedrop_client", "securedrop_client.gui", "securedrop_client.resources"],
+    packages=setuptools.find_packages(include=["securedrop_client", "securedrop_client.*"]),
     include_package_data=True,
     classifiers=[
         "Development Status :: 3 - Alpha",
diff --git a/debian/securedrop-export.postrm b/debian/securedrop-export.postrm
index 2a22244b1..192ee4d1d 100644
--- a/debian/securedrop-export.postrm
+++ b/debian/securedrop-export.postrm
@@ -1,8 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 # postrm script for securedrop-export
 #
 # see: dh_installdeb(1)
-# shellcheck disable=SC3010
 
 set -e