upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-05 23:04:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Maintain PATH for further invocations of letsencrypt-auto after bootstrap.

Browse source
This commit is contained in:
Adrien Ferrand 2019-07-25 15:03:53 +02:00
parent 736809c2a3
commit c2d165e88b
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
letsencrypt-auto-source/letsencrypt-auto
View file

@ -529,9 +529,6 @@ BootstrapRpmPython3Legacy() {
exit 1
fi
# Insert the SCL specific path in PATH to resolve the correct virtualenv binary from SCL
PATH="/opt/rh/rh-python36/root/usr/bin:$PATH"
BootstrapRpmCommonBase "$python_pkgs"
}
@ -808,6 +805,8 @@ elif [ -f /etc/redhat-release ]; then
}
USE_PYTHON_3=1
BOOTSTRAP_VERSION="BootstrapRpmPython3Legacy $BOOTSTRAP_RPM_PYTHON3_LEGACY_VERSION"
# Insert the SCL specific path in PATH to resolve the correct python binaries from SCL
PATH="/opt/rh/rh-python36/root/usr/bin:$PATH"
elif [ "$RPM_DIST_NAME" = "fedora" -a "$RPM_DIST_VERSION" -ge 29 -o "$PYVER" -eq 26 ]; then
Bootstrap() {
BootstrapMessage "RedHat-based OSes that will use Python3"

2
letsencrypt-auto-source/letsencrypt-auto.template
View file

@ -344,6 +344,8 @@ elif [ -f /etc/redhat-release ]; then
}
USE_PYTHON_3=1
BOOTSTRAP_VERSION="BootstrapRpmPython3Legacy $BOOTSTRAP_RPM_PYTHON3_LEGACY_VERSION"
# Insert the SCL specific path in PATH to resolve the correct python binaries from SCL
PATH="/opt/rh/rh-python36/root/usr/bin:$PATH"
elif [ "$RPM_DIST_NAME" = "fedora" -a "$RPM_DIST_VERSION" -ge 29 -o "$PYVER" -eq 26 ]; then
Bootstrap() {
BootstrapMessage "RedHat-based OSes that will use Python3"

3
letsencrypt-auto-source/pieces/bootstrappers/rpm_python3_legacy.sh
View file

@ -39,8 +39,5 @@ BootstrapRpmPython3Legacy() {
exit 1
fi
# Insert the SCL specific path in PATH to resolve the correct virtualenv binary from SCL
PATH="/opt/rh/rh-python36/root/usr/bin:$PATH"
BootstrapRpmCommonBase "$python_pkgs"
}