fixup setup build host script

Author: craigcomstock

ci/setup-cfengine-build-host.sh

@@ -1,12 +1,6 @@
 #!/usr/bin/env bash
 shopt -s expand_aliases
 
-#ready_flag=/etc/cfengine-buildhost-ready.flag
-#if [ -f "$ready_flag" ]; then
-#  echo "Found $ready_flag so skipping setup"
-#  exit 0
-#fi
-
 # Use the newest CFEngine version we can
 CFE_VERSION=3.26.0
 if [ -f /etc/centos-release ]; then
@@ -126,20 +120,21 @@ cd ..
 echo "Install any distribution upgrades"
 if [ -f /etc/os-release ]; then
   if grep rhel /etc/os-release; then
-    echo "rhel-10 seems to auto-upgrade in aws cloud anyway so skipping upgrades here"
-# on rhel-10 a yum proc goes anyway at startup so no need to explicitly upgrade and that even fails with cache problems for some reason
-     yum install -y git
-#    yum update --assumeyes
+    yum update --assumeyes
+    alias software=yum install --assumeyes
   elif grep debian /etc/os-release; then
     DEBIAN_FRONTEND=noninteractive apt upgrade --yes && DEBIAN_FRONTEND=noninteractive apt autoremove --yes
+    alias software=DEBIAN_FRONTEND=noninteractive apt install --yes
   elif grep suse /etc/os-release; then
     zypper -n update
+    alias software=zypper install -y
   else
     echo "Unknown platform ID $ID. Need this information in order to update/upgrade distribution packages."
     exit 1
   fi
 elif [ -f /etc/redhat-release ]; then
   yum update --assumeyes
+  alias software=yum install --assumeyes
 else
   echo "No /etc/os-release or /etc/redhat-release so cant determine platform."
   exit 1
@@ -181,10 +176,17 @@ else
   bash ./quick-install-cfengine-enterprise.sh agent
 fi
 
-# check if CFEngine install worked, cf-agent present?
+# if cf-agent not installed, try cf-remote --version master
+if [ ! -x /var/cfengine/bin/cf-agent ]; then
+  echo "quick install didn't install cf-agent, try cf-remote"
+  if software pipx; then
+    pipx install cf-remote
+    cf-remote --version master install --client localhost
+  fi
+fi
 if [ ! -x /var/cfengine/bin/cf-agent ]; then
-  # install from source
-  CFE_VERSION=master # hopefully master works and we don't have to figure out 3.27.0a or something that needs maintenance
+  echo "quickinstall and cf-remote didn't install cf-agent, try from source"
+  CFE_VERSION=3.26.0 # need to use an actualy release which has a checksum for masterfiles download
   rm -rf core # just in case we are repeating the script
   git clone --recursive --depth 1 https://github.com/cfengine/core
   cd core