From 34db7948865a0e1e8c10e5c815b53bef1009e33e Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Wed, 23 Oct 2019 21:36:54 +0200 Subject: [PATCH] Update scripts --- letsencrypt-auto-source/letsencrypt-auto | 6 +++--- letsencrypt-auto-source/tests/oraclelinux6_tests.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/letsencrypt-auto-source/letsencrypt-auto b/letsencrypt-auto-source/letsencrypt-auto index 360e82b43..955c23fc9 100755 --- a/letsencrypt-auto-source/letsencrypt-auto +++ b/letsencrypt-auto-source/letsencrypt-auto @@ -1156,7 +1156,7 @@ if [ "$1" = "--le-auto-phase2" ]; then # If the selected Bootstrap function isn't a noop and it differs from the # previously used version if [ -n "$BOOTSTRAP_VERSION" -a "$BOOTSTRAP_VERSION" != "$PREV_BOOTSTRAP_VERSION" ]; then - # Check if we can rebootstrap without manual user intervention: this requires that + # Check if we can rebootstrap without manual user intervention: this require that # certbot-auto is in non-interactive mode AND selected bootstrap does not claim to # require a manual user intervention. if [ "$NONINTERACTIVE" = 1 -a "$INTERACTIVE_BOOTSTRAP" != 1 ]; then @@ -1177,10 +1177,10 @@ if [ "$1" = "--le-auto-phase2" ]; then RerunWithArgs "$@" # Otherwise bootstrap needs to be done manually by the user. else - # If it is because bootstrapping is interactive, --non-interactive will be of no use. + # If it is because of the bootstrap, --non-interactive will be of no use. if [ "$INTERACTIVE_BOOTSTRAP" = 1 ]; then error "Skipping upgrade because new OS dependencies may need to be installed." - error "This requires a manual user intervention: please run this script again manually." + error "This requires manual user intervention: please run this script again manually." # If this is because of the environment (eg. non interactive shell without # --non-interactive flag set), help the user in that direction. else diff --git a/letsencrypt-auto-source/tests/oraclelinux6_tests.sh b/letsencrypt-auto-source/tests/oraclelinux6_tests.sh index 262b81a6c..8088284fc 100644 --- a/letsencrypt-auto-source/tests/oraclelinux6_tests.sh +++ b/letsencrypt-auto-source/tests/oraclelinux6_tests.sh @@ -6,7 +6,7 @@ LE_AUTO_PY_34="certbot/letsencrypt-auto-source/letsencrypt-auto_py_34" LE_AUTO="certbot/letsencrypt-auto-source/letsencrypt-auto" # Check bootstrap from current letsencrypt-auto will fail, because SCL is not enabled. -if ! "$LE_AUTO" 2>&1 | grep -q "Enable the SCL repository and try running Certbot again."; then +if ! "$LE_AUTO" -n 2>&1 | grep -q "Enable the SCL repository and try running Certbot again."; then echo "ERROR: Bootstrap was not aborted although SCL was not installed!" exit 1 fi