fix conflict

Author: chuckp22

bin/ghe-host-check

@@ -172,7 +172,7 @@ if [[ "$CALLING_SCRIPT" == "ghe-backup" ]]; then
 
   #min_disk_req=$(( $(echo "$repos_disk_size" | awk '{printf "%.0f", $1}') + $(echo "$pages_disk_size" | awk '{printf "%.0f", $1}') + $(echo "$es_disk_size" | awk '{printf "%.0f", $1}') + $(echo "$stor_disk_size" | awk '{printf "%.0f", $1}') + $(echo "$minio_disk_size" | awk '{printf "%.0f", $1}') + $(echo "$mysql_disk_size" | awk '{printf "%.0f", $1/2}') + $(echo "$actions_disk_size" | awk '{printf "%.0f", $1}') + $(echo "$mssql_disk_size" | awk '{printf "%.0f", $1}') ))
   min_disk_req=$(( $(echo "$repos_disk_size") + $(echo "$pages_disk_size") + $(echo "$es_disk_size") + $(echo "$stor_disk_size") + $(echo "$minio_disk_size") + $(echo "$mysql_disk_size") + $(echo "$actions_disk_size") + $(echo "$mssql_disk_size") ))
-  echo "Data transfer size for - repositories = $repos_disk_size, pages: $pages_disk_size, elasticsearch: $es_disk_size, storage: $stor_disk_size, minio: $minio_disk_size, mysql: $mysql_disk_size, actions: $actions_disk_size, mssql: $mssql_disk_size" 1>&2
+echo -e "### Data Transfer Sizes \nrepositories: $repos_disk_size \npages: $pages_disk_size \nelasticsearch: $es_disk_size \nstorage: $stor_disk_size \nminio: $minio_disk_size \nmysql: $mysql_disk_size \nactions: $actions_disk_size \nmssql: $mssql_disk_size" 1>&2
   printf "min_disk_required for this backup is at least %d MB\n" "$((min_disk_req / 1024 ** 2))" 1>&2
 
   if [[ $available_space -lt $min_disk_req ]]; then
@@ -186,22 +186,27 @@ if [[ "$CALLING_SCRIPT" == "ghe-backup" ]]; then
     echo "rsync version $rsync_version in backup-host does not meet minimum requirements." 1>&2
     echo "Please make sure you have the minimum required version of rsync: $min_rsync installed" 1>&2
     exit 1
-  fi
+else
+  echo "rsync ${rsync_version} >= required ($min_rsync)"
+fi
 
   ssh_version=$(ssh -V 2>&1 | awk '{print $1}'|grep -oPm 1 '[\d\.]+' |head -1)
   if awk "BEGIN {exit !($ssh_version < $min_openssh)}" &> /dev/null; then
     echo "openSSH version $ssh_version in backup-host does not meet minimum requirements." 1>&2
     echo "Please make sure the minimum required version of openSSH: $min_openssh is installed" 1>&2
     exit 1
-  fi
+else
+  echo "openSSH ${ssh_version} >= required ($min_openssh)"
+fi
 
   jq_version=$(jq --version |awk -F\- '{print $2}')
   if awk "BEGIN {exit !($jq_version < $min_jq)}" &> /dev/null; then
     echo "jq version $jq_version in backup-host does not meet minimum requirements." 1>&2
     echo "Please make sure you have the minimum required version of jq: $min_jq installed" 1>&2
     exit 1
-  fi
-  echo "Backup host meets minimum software requirements for OpenSSH, rsync and jq." 1>&2
+else
+  echo "jq ${jq_version} >= required ($min_jq)"
+fi```
 fi
 
 echo "Connect $hostname:$port OK (v$version)"