From 7a2823406744bb561b85d8afa003ba51aa687d9d Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Tue, 22 Sep 2020 00:59:42 +0200 Subject: [PATCH] Revert "Keep the wrapper ..." This reverts commit 0b7c361e0327ae685d5f7d3ca6f24a3cdb510b37. --- certbot.wrapper | 2 -- snap/snapcraft.yaml | 8 ++------ 2 files changed, 2 insertions(+), 8 deletions(-) delete mode 100755 certbot.wrapper diff --git a/certbot.wrapper b/certbot.wrapper deleted file mode 100755 index f99b25d81..000000000 --- a/certbot.wrapper +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec certbot "$@" diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 7076f7e18..d0a8adba8 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -20,13 +20,13 @@ adopt-info: certbot apps: certbot: - command: certbot.wrapper + command: 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: certbot.wrapper -q renew + command: 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" @@ -81,10 +81,6 @@ parts: cd $SNAPCRAFT_PART_SRC python3 tools/strip_hashes.py letsencrypt-auto-source/pieces/dependency-requirements.txt | grep -v python-augeas > snap-constraints.txt snapcraftctl set-version `git describe|sed s/^v//` - wrappers: - plugin: dump - source: . - stage: [certbot.wrapper] shared-metadata: plugin: dump source: .