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 3

Various corrections

Browse source
This commit is contained in:
Adrien Ferrand 2019-07-30 10:16:22 +02:00
parent c2d165e88b
commit bbade209aa
4 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
letsencrypt-auto-source/letsencrypt-auto
View file

@ -390,17 +390,17 @@ InitializeRPMCommonBase() {
fi
if ! $TOOL list *virtualenv >/dev/null 2>&1; then
echo "To use Certbot, packages from the EPEL repository need to be installed."
echo "To use Certbot on this operating system, packages from the EPEL repository need to be installed."
if ! $TOOL list epel-release >/dev/null 2>&1; then
error "Enable the EPEL repository and try running Certbot again."
exit 1
fi
if [ "$ASSUME_YES" = 1 ]; then
/bin/echo -n "Enabling the EPEL repository in 3 seconds..."
/bin/echo -n "Enabling the EPEL repository in 3 seconds... (Press Ctrl-C to cancel)"
sleep 1s
/bin/echo -ne "\e[0K\rEnabling the EPEL repository in 2 seconds..."
/bin/echo -ne "\e[0K\rEnabling the EPEL repository in 2 seconds... (Press Ctrl-C to cancel)"
sleep 1s
/bin/echo -e "\e[0K\rEnabling the EPEL repository in 1 second..."
/bin/echo -e "\e[0K\rEnabling the EPEL repository in 1 second... (Press Ctrl-C to cancel)"
sleep 1s
fi
if ! $TOOL install $YES_FLAG $QUIET_FLAG epel-release; then
@ -498,28 +498,28 @@ BootstrapRpmPython3Legacy() {
InitializeRPMCommonBase
if ! $TOOL list rh-python36 >/dev/null 2>&1; then
echo "To use Certbot, packages from the SCL repository need to be installed."
if ! $TOOL list centos-release-scl >/dev/null 2>&1; then
if ! "${TOOL}" list rh-python36 >/dev/null 2>&1; then
echo "To use Certbot on this operating system, packages from the SCL repository need to be installed."
if ! "${TOOL}" list centos-release-scl >/dev/null 2>&1; then
error "Enable the SCL repository and try running Certbot again."
exit 1
fi
if [ "$ASSUME_YES" = 1 ]; then
/bin/echo -n "Enabling the SCL repository in 3 seconds..."
if [ "${ASSUME_YES}" = 1 ]; then
/bin/echo -n "Enabling the SCL repository in 3 seconds... (Press Ctrl-C to cancel)"
sleep 1s
/bin/echo -ne "\e[0K\rEnabling the SCL repository in 2 seconds..."
/bin/echo -ne "\e[0K\rEnabling the SCL repository in 2 seconds... (Press Ctrl-C to cancel)"
sleep 1s
/bin/echo -e "\e[0K\rEnabling the SCL repository in 1 second..."
/bin/echo -e "\e[0K\rEnabling the SCL repository in 1 second... (Press Ctrl-C to cancel)"
sleep 1s
fi
if ! $TOOL install $YES_FLAG $QUIET_FLAG centos-release-scl; then
if ! "${TOOL}" install "${YES_FLAG}" "${QUIET_FLAG}" centos-release-scl; then
error "Could not enable SCL. Aborting bootstrap!"
exit 1
fi
fi
# CentOS 6 must use rh-python36 from SCL
if $TOOL list rh-python36 >/dev/null 2>&1; then
if "${TOOL}" list rh-python36 >/dev/null 2>&1; then
python_pkgs="rh-python36-python
rh-python36-python-virtualenv
rh-python36-python-devel
@ -529,7 +529,7 @@ BootstrapRpmPython3Legacy() {
exit 1
fi
BootstrapRpmCommonBase "$python_pkgs"
BootstrapRpmCommonBase "${python_pkgs}"
}
# If new packages are installed by BootstrapRpmPython3 below, this version
@ -800,7 +800,7 @@ elif [ -f /etc/redhat-release ]; then
fi
if [ "$PYVER" -eq 26 ]; then
Bootstrap() {
BootstrapMessage "Legacy RedHat-based OSes that will use Python3"
BootstrapMessage "Legacy Red Hat-based OSes that will use Python3"
BootstrapRpmPython3Legacy
}
USE_PYTHON_3=1
@ -809,14 +809,14 @@ elif [ -f /etc/redhat-release ]; then
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"
BootstrapMessage "Red Hat-based OSes that will use Python3"
BootstrapRpmPython3
}
USE_PYTHON_3=1
BOOTSTRAP_VERSION="BootstrapRpmPython3 $BOOTSTRAP_RPM_PYTHON3_VERSION"
else
Bootstrap() {
BootstrapMessage "RedHat-based OSes"
BootstrapMessage "Red Hat-based OSes"
BootstrapRpmCommon
}
BOOTSTRAP_VERSION="BootstrapRpmCommon $BOOTSTRAP_RPM_COMMON_VERSION"

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

@ -339,7 +339,7 @@ elif [ -f /etc/redhat-release ]; then
fi
if [ "$PYVER" -eq 26 ]; then
Bootstrap() {
BootstrapMessage "Legacy RedHat-based OSes that will use Python3"
BootstrapMessage "Legacy Red Hat-based OSes that will use Python3"
BootstrapRpmPython3Legacy
}
USE_PYTHON_3=1
@ -348,14 +348,14 @@ elif [ -f /etc/redhat-release ]; then
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"
BootstrapMessage "Red Hat-based OSes that will use Python3"
BootstrapRpmPython3
}
USE_PYTHON_3=1
BOOTSTRAP_VERSION="BootstrapRpmPython3 $BOOTSTRAP_RPM_PYTHON3_VERSION"
else
Bootstrap() {
BootstrapMessage "RedHat-based OSes"
BootstrapMessage "Red Hat-based OSes"
BootstrapRpmCommon
}
BOOTSTRAP_VERSION="BootstrapRpmCommon $BOOTSTRAP_RPM_COMMON_VERSION"

8
letsencrypt-auto-source/pieces/bootstrappers/rpm_common_base.sh
View file

@ -25,17 +25,17 @@ InitializeRPMCommonBase() {
fi
if ! $TOOL list *virtualenv >/dev/null 2>&1; then
echo "To use Certbot, packages from the EPEL repository need to be installed."
echo "To use Certbot on this operating system, packages from the EPEL repository need to be installed."
if ! $TOOL list epel-release >/dev/null 2>&1; then
error "Enable the EPEL repository and try running Certbot again."
exit 1
fi
if [ "$ASSUME_YES" = 1 ]; then
/bin/echo -n "Enabling the EPEL repository in 3 seconds..."
/bin/echo -n "Enabling the EPEL repository in 3 seconds... (Press Ctrl-C to cancel)"
sleep 1s
/bin/echo -ne "\e[0K\rEnabling the EPEL repository in 2 seconds..."
/bin/echo -ne "\e[0K\rEnabling the EPEL repository in 2 seconds... (Press Ctrl-C to cancel)"
sleep 1s
/bin/echo -e "\e[0K\rEnabling the EPEL repository in 1 second..."
/bin/echo -e "\e[0K\rEnabling the EPEL repository in 1 second... (Press Ctrl-C to cancel)"
sleep 1s
fi
if ! $TOOL install $YES_FLAG $QUIET_FLAG epel-release; then

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

@ -8,28 +8,28 @@ BootstrapRpmPython3Legacy() {
InitializeRPMCommonBase
if ! $TOOL list rh-python36 >/dev/null 2>&1; then
echo "To use Certbot, packages from the SCL repository need to be installed."
if ! $TOOL list centos-release-scl >/dev/null 2>&1; then
if ! "${TOOL}" list rh-python36 >/dev/null 2>&1; then
echo "To use Certbot on this operating system, packages from the SCL repository need to be installed."
if ! "${TOOL}" list centos-release-scl >/dev/null 2>&1; then
error "Enable the SCL repository and try running Certbot again."
exit 1
fi
if [ "$ASSUME_YES" = 1 ]; then
/bin/echo -n "Enabling the SCL repository in 3 seconds..."
if [ "${ASSUME_YES}" = 1 ]; then
/bin/echo -n "Enabling the SCL repository in 3 seconds... (Press Ctrl-C to cancel)"
sleep 1s
/bin/echo -ne "\e[0K\rEnabling the SCL repository in 2 seconds..."
/bin/echo -ne "\e[0K\rEnabling the SCL repository in 2 seconds... (Press Ctrl-C to cancel)"
sleep 1s
/bin/echo -e "\e[0K\rEnabling the SCL repository in 1 second..."
/bin/echo -e "\e[0K\rEnabling the SCL repository in 1 second... (Press Ctrl-C to cancel)"
sleep 1s
fi
if ! $TOOL install $YES_FLAG $QUIET_FLAG centos-release-scl; then
if ! "${TOOL}" install "${YES_FLAG}" "${QUIET_FLAG}" centos-release-scl; then
error "Could not enable SCL. Aborting bootstrap!"
exit 1
fi
fi
# CentOS 6 must use rh-python36 from SCL
if $TOOL list rh-python36 >/dev/null 2>&1; then
if "${TOOL}" list rh-python36 >/dev/null 2>&1; then
python_pkgs="rh-python36-python
rh-python36-python-virtualenv
rh-python36-python-devel
@ -39,5 +39,5 @@ BootstrapRpmPython3Legacy() {
exit 1
fi
BootstrapRpmCommonBase "$python_pkgs"
BootstrapRpmCommonBase "${python_pkgs}"
}