From b5fcd646617123e0193585377e48ddfdeb9b84b7 Mon Sep 17 00:00:00 2001
From: Erica Portnoy <ebportnoy@gmail.com>
Date: Wed, 22 Jul 2020 15:57:27 -0700
Subject: [PATCH] small bash fixes

---
 tools/generate_dnsplugins_postrefreshhook.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/generate_dnsplugins_postrefreshhook.sh b/tools/generate_dnsplugins_postrefreshhook.sh
index be19c516b..00da03516 100755
--- a/tools/generate_dnsplugins_postrefreshhook.sh
+++ b/tools/generate_dnsplugins_postrefreshhook.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Generate the hooks/post-refresh file for all DNS plugins
-set -e
+set -eu
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 CERTBOT_DIR="$(dirname "${DIR}")"
@@ -24,7 +24,7 @@ cb_installed=\$(cat \$SNAP/certbot-shared/certbot-version.txt)
 cb_required=\$(grep -oP "version = '\K.*(?=')" \$SNAP/setup.py)
 
 
-$SNAP/bin/python3 -c "import sys; from setuptools._vendor.packaging import version; sys.exit(1) if\
+\$SNAP/bin/python3 -c "import sys; from packaging import version; sys.exit(1) if\
   version.parse('\$cb_installed') < version.parse('\$cb_required') else sys.exit(0)" || exit_code=\$?
 if [ "\$exit_code" -eq 1 ]; then
   echo "Certbot is version \$cb_installed but needs to be at least \$cb_required before" \\