From 5d422eb82c2cf92a04e54fcfd3dcd441bceac5e0 Mon Sep 17 00:00:00 2001
From: Adrien Ferrand <ferrand.ad@gmail.com>
Date: Mon, 21 Oct 2019 00:02:28 +0200
Subject: [PATCH] Update message

---
 letsencrypt-auto-source/letsencrypt-auto          | 8 ++++----
 letsencrypt-auto-source/letsencrypt-auto.template | 5 +----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/letsencrypt-auto-source/letsencrypt-auto b/letsencrypt-auto-source/letsencrypt-auto
index 911243faa..16c7366f6 100755
--- a/letsencrypt-auto-source/letsencrypt-auto
+++ b/letsencrypt-auto-source/letsencrypt-auto
@@ -376,6 +376,9 @@ BootstrapDebCommon() {
 
 # Sets TOOL to the name of the package manager
 # Sets appropriate values for YES_FLAG and QUIET_FLAG based on $ASSUME_YES and $QUIET_FLAG.
+# Note: this function is called both while selecting the bootstrap scripts and
+# during the actual bootstrap. Some things like prompting to user can be done in the latter
+# case, but not in the former one.
 InitializeRPMCommonBase() {
   if type dnf 2>/dev/null
   then
@@ -830,7 +833,6 @@ elif [ -f /etc/redhat-release ]; then
     # Check if an automated bootstrap can be achieved on this system.
     if ! Python36SclIsAvailable; then
       INTERACTIVE_BOOTSTRAP=1
-      INTERACTIVE_BOOTSTRAP_MESSAGE="Enable the SCL repository and try running Certbot again."
     fi
 
     Bootstrap() {
@@ -1176,11 +1178,9 @@ if [ "$1" = "--le-auto-phase2" ]; then
       # Otherwise bootstrap needs to be done manually by the user.
       else
         # If it is because of the bootstrap, --non-interactive will be of no use.
-        # Display the OS-specific interactive bootstrap message.
         if [ "$INTERACTIVE_BOOTSTRAP" = 1 ]; then
           error "Skipping upgrade because new OS dependencies may need to be installed."
-          error "This requires a manual user intervention."
-          error "$INTERACTIVE_BOOTSTRAP_MESSAGE"
+          error "This requires a 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/letsencrypt-auto.template b/letsencrypt-auto-source/letsencrypt-auto.template
index a6ae6484f..7371ea446 100755
--- a/letsencrypt-auto-source/letsencrypt-auto.template
+++ b/letsencrypt-auto-source/letsencrypt-auto.template
@@ -358,7 +358,6 @@ elif [ -f /etc/redhat-release ]; then
     # Check if an automated bootstrap can be achieved on this system.
     if ! Python36SclIsAvailable; then
       INTERACTIVE_BOOTSTRAP=1
-      INTERACTIVE_BOOTSTRAP_MESSAGE="Enable the SCL repository and try running Certbot again."
     fi
 
     Bootstrap() {
@@ -596,11 +595,9 @@ if [ "$1" = "--le-auto-phase2" ]; then
       # Otherwise bootstrap needs to be done manually by the user.
       else
         # If it is because of the bootstrap, --non-interactive will be of no use.
-        # Display the OS-specific interactive bootstrap message.
         if [ "$INTERACTIVE_BOOTSTRAP" = 1 ]; then
           error "Skipping upgrade because new OS dependencies may need to be installed."
-          error "This requires a manual user intervention."
-          error "$INTERACTIVE_BOOTSTRAP_MESSAGE"
+          error "This requires a 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