Update preinstall script to update agent config from V2 to V3

Author: dhurley

scripts/packages/preinstall.sh

@@ -18,8 +18,9 @@ INSTANCE_GROUP=""
 ################################
 export NGINX_ONE_HOST="${NGINX_AGENT_SERVER_HOST:-agent.connect.nginx.com}"
 export AGENT_GROUP="${AGENT_GROUP:-$(id -ng)}"
-RED='\033[0;31m'
-NC='\033[0m'
+
+RED_COLOUR='\033[0;31m'
+NO_COLOUR='\033[0m'
 
 # Determine OS platform
 # shellcheck source=/dev/null
@@ -125,9 +126,9 @@ update_config_file() {
         echo "NGINX Agent server host should be ${NGINX_ONE_HOST}"
 
         if grep -q "$NGINX_ONE_HOST" ${v2_config_file}; then
-            echo "NGINX One connected agent"
+            echo "NGINX Agent is connected to NGINX One"
         else 
-            echo "${RED}Previous version of NGINX Agent was not connected to NGINX One. Stopping upgrade.${NC}" 
+            echo "${RED_COLOUR}Previous version of NGINX Agent was not connected to NGINX One. Stopping upgrade${NO_COLOUR}" 
             exit 1
         fi
 

scripts/packages/upgrade-agent-config.sh

@@ -7,8 +7,9 @@ set -e
 # NGINX Agent script for converting NGINX AGENT V2 config format to V3 config format
 
 export NGINX_ONE_HOST="${NGINX_AGENT_SERVER_HOST:-agent.connect.nginx.com}"
-RED='\033[0;31m'
-NC='\033[0m'
+
+RED_COLOUR='\033[0;31m'
+NO_COLOUR='\033[0m'
 
 for i in "$@"; do
   case $i in
@@ -32,9 +33,9 @@ done
 echo "NGINX Agent server host should be ${NGINX_ONE_HOST}"
 
 if grep -q "$NGINX_ONE_HOST" ${v2_config_file}; then
-    echo "N1 connected agent"
+    echo "NGINX Agent is connected to NGINX One"
 else 
-    echo "${RED}Previous version of NGINX Agent was not connected to NGINX One. Stopping upgrade.${NC}" 
+    echo "${RED_COLOUR}Previous version of NGINX Agent was not connected to NGINX One. Stopping upgrade${NO_COLOUR}" 
     exit 1
 fi