snap: revert curl/jq in wrapper, use gawk for now

This commit is contained in:
Alex Zorin 2020-09-03 10:14:15 +10:00
parent 6fc2516a13
commit 7f22561237
2 changed files with 2 additions and 3 deletions

View file

@ -29,7 +29,7 @@ esac
export CERTBOT_AUGEAS_PATH="${SNAP}/usr/lib/${ARCH_TRIPLET}/libaugeas.so.0"
CERTBOT_PLUGIN_PATH="$(curl -s --unix /run/snapd.socket "http://localhost/v2/connections?snap=certbot&interface=content" | jq -r '.result.established | map(select(.plug.plug == "plugin" and ."plug-attrs".content == "certbot-1") | "/snap/"+.slot.snap+"/current/lib/python3.8/site-packages" ) | join(":")')"
CERTBOT_PLUGIN_PATH="$(snap connections certbot | gawk 'BEGIN {ORS=""} NR>1 { if ($1 == "content[certbot-1]") { split($3,a,":"); PLUGINS=PLUGINS":/snap/"a[1]"/current/lib/python3.8/site-packages/"; next; } } END { print substr(PLUGINS, 2) }')"
export CERTBOT_PLUGIN_PATH
exec certbot "$@"

View file

@ -72,8 +72,7 @@ parts:
- python3-pkg-resources
- python3.8-minimal
# added for certbot.wrapper script:
- curl
- jq
- gawk
# To build cryptography and cffi if needed
build-packages: [gcc, libffi-dev, libssl-dev, git, libaugeas-dev, python3-dev]
build-environment: