From 0f61b9cd5335f48d79120d2bd81d6e31cb561605 Mon Sep 17 00:00:00 2001
From: Adrien Ferrand <ferrand.ad@gmail.com>
Date: Tue, 29 Sep 2020 00:04:32 +0200
Subject: [PATCH] Use the python script call approach

---
 certbot/certbot/__main__.py | 5 -----
 snap/snapcraft.yaml         | 4 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)
 delete mode 100644 certbot/certbot/__main__.py

diff --git a/certbot/certbot/__main__.py b/certbot/certbot/__main__.py
deleted file mode 100644
index 987bd71a1..000000000
--- a/certbot/certbot/__main__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-"""Certbot entrypoint for package execution"""
-from certbot.main import main
-
-if __name__ == "__main__":
-    main()
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index cf7bf0468..2b564662b 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -20,13 +20,13 @@ adopt-info: certbot
 
 apps:
   certbot:
-    command: bin/python3 -m certbot
+    command: bin/python3 $SNAP/bin/certbot
     environment:
       PATH: "$SNAP/bin:$SNAP/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games"
       AUGEAS_LENS_LIB: "$SNAP/usr/share/augeas/lenses/dist"
       CERTBOT_SNAPPED: "True"
   renew:
-    command: bin/python3 -m certbot -q renew
+    command: bin/python3 $SNAP/bin/certbot -q renew
     daemon: oneshot
     environment:
       PATH: "$SNAP/bin:$SNAP/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games"