From 9d3dd9f7a8b21c09c97f47e78d616108e1a60e4e Mon Sep 17 00:00:00 2001
From: Josh Cooper <joshcooper@users.noreply.github.com>
Date: Thu, 27 Jun 2024 13:32:45 -0700
Subject: [PATCH] (PE-38404) Update script for AL2 (again)

AL2 x86_64 was broken when AL2 aarch64 support was added. Pull in latest
puppet_agent module and regenerate script.
---
 install.sh           | 12 +++++-------
 modules/puppet_agent |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/install.sh b/install.sh
index 2c70d36..2bb7772 100755
--- a/install.sh
+++ b/install.sh
@@ -519,11 +519,6 @@ case $platform in
   "SLES")
     platform_version=$major_version
     ;;
-  "Amzn"|"Amazon Linux")
-    case $platform_version in
-      "2") platform_version="2";;
-    esac
-    ;;
 esac
 
 # Find which version of puppet is currently installed if any
@@ -897,8 +892,11 @@ case $platform in
     info "Amazon platform! Lets get you an RPM..."
     filetype="rpm"
     platform_package="el"
-    # For Amazon Linux 2023 and onwards we can use the 'amazon' packages created instead of 'el' packages
-    if (( $platform_version >= 2 )); then
+    arch="$(uname -p)"
+    # Install amazon packages on AL2 (only aarch64) and 2023 and up (all arch)
+    if [[ $platform_version == 2 && $arch == 'x86_64' ]]; then
+      platform_version="7"
+    elif (( platform_version == 2 || platform_version >= 2023 )); then
       platform_package="amazon"
     fi
     filename="${collection}-release-${platform_package}-${platform_version}.noarch.rpm"
diff --git a/modules/puppet_agent b/modules/puppet_agent
index cae2480..4ba46ba 160000
--- a/modules/puppet_agent
+++ b/modules/puppet_agent
@@ -1 +1 @@
-Subproject commit cae24809600cf8768f769ea228edfb3ffea69014
+Subproject commit 4ba46baaa9dc68d2a8adf35b335a405944cea9a9