From 22ac01de186c971fd962bbecb4ad013e30c55b57 Mon Sep 17 00:00:00 2001
From: pjcreath <pjcreath@users.noreply.github.com>
Date: Fri, 17 Jun 2022 20:58:32 +0000
Subject: [PATCH 01/20] Install Oracle's EPEL repo on Oracle Linux 7 and 8.

---
 bootstrap-salt.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 4c11c5d..825b267 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -4817,6 +4817,15 @@ install_red_hat_enterprise_workstation_testing_post() {
 #   Oracle Linux Install Functions
 #
 install_oracle_linux_stable_deps() {
+    # Install Oracle's EPEL.
+    if [ ${_EPEL_REPOS_INSTALLED} -eq $BS_FALSE ]; then
+        _EPEL_REPO=oracle-epel-release-el${DISTRO_MAJOR_VERSION}
+        if ! rpm -q "${_EPEL_REPO}" > /dev/null; then
+            __yum_install_noinput "${_EPEL_REPO}"
+        fi
+        _EPEL_REPOS_INSTALLED=$BS_TRUE
+    fi
+
     install_centos_stable_deps || return 1
     return 0
 }

From c56840296c1f9205aa1347e8187cad65d695003c Mon Sep 17 00:00:00 2001
From: "github-actions[bot] on behalf of @s0undt3ch"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 13 Aug 2022 22:29:12 +0000
Subject: [PATCH 02/20] Update README.rst with 2022.08.13 release sha256sum

---
 README.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.rst b/README.rst
index c70071a..f597b11 100644
--- a/README.rst
+++ b/README.rst
@@ -32,6 +32,7 @@ sum** of the downloaded ``bootstrap-salt.sh`` file.
 
 The SHA256 sum of the ``bootstrap-salt.sh`` file, per release, is:
 
+- 2022.08.13: ``af922699c1a2bb3b89b6dac04397389999df1b3416b8d0b5c93766412f14c95c``
 - 2022.08.12: ``b46f018bbf02f45c6096ab96e9261a9adb3a78ff65092c3976f32ffde909afcb``
 - 2022.05.19: ``e92e1df6930285cf23eda188bee3cfa3dd6c577b4fb7aa91b29213ad820199b1``
 - 2022.03.15: ``8f65952c3435f441e7f793941d5162d3ec2033a9ef82722ff1da67a2ef860a2f``

From 19a07a4dc48da1d2ef0f9703bbd1818e3fded91b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ege=20Can=20=C3=96ZER?= <egecan.ozer@gmail.com>
Date: Mon, 15 Aug 2022 21:11:57 +0300
Subject: [PATCH 03/20] Update README for Windows installation

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index f597b11..227c96a 100644
--- a/README.rst
+++ b/README.rst
@@ -395,7 +395,7 @@ Install on Windows
 Using ``PowerShell`` to install latest stable version:
 
 .. code:: console
-
+  New-Item -ItemType Directory -Force -Path C:\Temp
   Invoke-WebRequest -Uri https://winbootstrap.saltproject.io -OutFile C:\Temp\bootstrap-salt.ps1
   Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Scope CurrentUser
   C:\Temp\bootstrap-salt.ps1

From cf176b3da239962fb6f9c25d291be0b715b3f141 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ege=20Can=20=C3=96ZER?= <egecan.ozer@gmail.com>
Date: Mon, 15 Aug 2022 21:15:42 +0300
Subject: [PATCH 04/20] Add a newline to Install on Windows codeblock

---
 README.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.rst b/README.rst
index 227c96a..590f3ad 100644
--- a/README.rst
+++ b/README.rst
@@ -395,6 +395,7 @@ Install on Windows
 Using ``PowerShell`` to install latest stable version:
 
 .. code:: console
+
   New-Item -ItemType Directory -Force -Path C:\Temp
   Invoke-WebRequest -Uri https://winbootstrap.saltproject.io -OutFile C:\Temp\bootstrap-salt.ps1
   Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Scope CurrentUser

From 88a915b7541742b2b4c81eec4ea5d9bb78ea2252 Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@saltstack.com>
Date: Thu, 1 Sep 2022 13:05:48 -0700
Subject: [PATCH 05/20] Update the bootstrap script to work with final onedir
 releases.

---
 bootstrap-salt.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 19e4124..65e8f04 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -639,10 +639,10 @@ elif [ "$ITYPE" = "onedir" ]; then
         if [ "$(echo "$1" | grep -E '^(latest)$')" != "" ]; then
             ONEDIR_REV="$1"
             shift
-        elif [ "$(echo "$1" | grep -E '^([3-9][0-9]{3}(\.[0-9]*)?)$')" != "" ]; then
+        elif [ "$(echo "$1" | grep -E '^([3-9][0-9]{3}?-[0-9]$)')" != "" ]; then
             # Handle the 3xxx.0 version as 3xxx archive (pin to minor) and strip the fake ".0" suffix
-            ONEDIR_REV=$(echo "$1" | sed -E 's/^([3-9][0-9]{3})\.0$/\1/')
-            ONEDIR_REV="minor/$ONEDIR_REV"
+            #ONEDIR_REV=$(echo "$1" | sed -E 's/^([3-9][0-9]{3})\.0$/\1/')
+            ONEDIR_REV="minor/$1"
             shift
         else
             echo "Unknown stable version: $1 (valid: 3005, latest.)"
@@ -669,7 +669,7 @@ elif [ "$ITYPE" = "onedir_rc" ]; then
             ONEDIR_REV="minor/$1"
             shift
         else
-            echo "Unknown stable version: $1 (valid: 3005, latest.)"
+            echo "Unknown stable version: $1 (valid: 3005-1, latest.)"
             exit 1
         fi
     fi
@@ -4491,7 +4491,7 @@ enabled=1
 enabled_metadata=1
 _eof
 
-        fetch_url="${HTTP_VAL}://${_REPO_URL}/${_ONEDIR_DIR}/${__PY_VERSION_REPO}/redhat/${DISTRO_MAJOR_VERSION}/${CPU_ARCH_L}/"
+        fetch_url="${HTTP_VAL}://${_REPO_URL}/${_ONEDIR_DIR}/${__PY_VERSION_REPO}/redhat/${DISTRO_MAJOR_VERSION}/${CPU_ARCH_L}/${ONEDIR_REV}/"
         for key in $gpg_key; do
             __rpm_import_gpg "${fetch_url}${key}" || return 1
         done

From 7fc46cdfda31b3dd5323f4299cdea89f5e921130 Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@saltstack.com>
Date: Mon, 12 Sep 2022 17:57:21 -0700
Subject: [PATCH 06/20] Ensure the REPO_ARCH for Arm64 is correct.

---
 bootstrap-salt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 65e8f04..e8fe1ea 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -1440,7 +1440,7 @@ __check_dpkg_architecture() {
             else
                 # Saltstack official repository does not yet have arm64 metadata,
                 # use amd64 repositories on arm64, since all pkgs are arch-independent
-                __REPO_ARCH="amd64"
+                __REPO_ARCH="arm64"
                 __REPO_ARCH_DEB="deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=$__REPO_ARCH]"
                 warn_msg="Support for arm64 packages is experimental and might rely on architecture-independent packages from the amd64 repository."
             fi

From 3d9c0497f495b49741c325591150a8635b08da78 Mon Sep 17 00:00:00 2001
From: Jeff  Neel <10672501+jeff350@users.noreply.github.com>
Date: Mon, 12 Sep 2022 23:10:12 -0500
Subject: [PATCH 07/20] strip .0

---
 bootstrap-salt.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 65e8f04..fa0b4bc 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -639,10 +639,9 @@ elif [ "$ITYPE" = "onedir" ]; then
         if [ "$(echo "$1" | grep -E '^(latest)$')" != "" ]; then
             ONEDIR_REV="$1"
             shift
-        elif [ "$(echo "$1" | grep -E '^([3-9][0-9]{3}?-[0-9]$)')" != "" ]; then
+        elif [ "$(echo "$1" | grep -E '^([3-9][0-9]{3}(\.[0-9]))')" != "" ]; then
             # Handle the 3xxx.0 version as 3xxx archive (pin to minor) and strip the fake ".0" suffix
-            #ONEDIR_REV=$(echo "$1" | sed -E 's/^([3-9][0-9]{3})\.0$/\1/')
-            ONEDIR_REV="minor/$1"
+            ONEDIR_REV=$(echo "$1" | sed -E 's/^([3-9][0-9]{3})\.0$/\1/')
             shift
         else
             echo "Unknown stable version: $1 (valid: 3005, latest.)"

From f9b6cf3628a39caaff05c87637b465cc9f3b417a Mon Sep 17 00:00:00 2001
From: Jeff  Neel <10672501+jeff350@users.noreply.github.com>
Date: Tue, 13 Sep 2022 00:14:46 -0500
Subject: [PATCH 08/20] fix regex

---
 bootstrap-salt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index fa0b4bc..957c8d0 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -639,7 +639,7 @@ elif [ "$ITYPE" = "onedir" ]; then
         if [ "$(echo "$1" | grep -E '^(latest)$')" != "" ]; then
             ONEDIR_REV="$1"
             shift
-        elif [ "$(echo "$1" | grep -E '^([3-9][0-9]{3}(\.[0-9]))')" != "" ]; then
+        elif [ "$(echo "$1" | grep -E '^([3-9][0-9]{3}(\.[0-9]*))')" != "" ]; then
             # Handle the 3xxx.0 version as 3xxx archive (pin to minor) and strip the fake ".0" suffix
             ONEDIR_REV=$(echo "$1" | sed -E 's/^([3-9][0-9]{3})\.0$/\1/')
             shift

From 04257ca5b3da5714cb151b10f007bfddde6ea115 Mon Sep 17 00:00:00 2001
From: Jeff  Neel <10672501+jeff350@users.noreply.github.com>
Date: Tue, 13 Sep 2022 00:31:59 -0500
Subject: [PATCH 09/20] fix regex

---
 bootstrap-salt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 957c8d0..bc497b7 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -639,7 +639,7 @@ elif [ "$ITYPE" = "onedir" ]; then
         if [ "$(echo "$1" | grep -E '^(latest)$')" != "" ]; then
             ONEDIR_REV="$1"
             shift
-        elif [ "$(echo "$1" | grep -E '^([3-9][0-9]{3}(\.[0-9]*))')" != "" ]; then
+        elif [ "$(echo "$1" | grep -E '^([3-9][0-9]{3}(\.[0-9]*)?)')" != "" ]; then
             # Handle the 3xxx.0 version as 3xxx archive (pin to minor) and strip the fake ".0" suffix
             ONEDIR_REV=$(echo "$1" | sed -E 's/^([3-9][0-9]{3})\.0$/\1/')
             shift

From 3b833c217a3a7007bfa18334f7d39275b63ed39a Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@saltstack.com>
Date: Tue, 13 Sep 2022 08:06:50 -0700
Subject: [PATCH 10/20] fixing mention of amd64 which should be arm64.

---
 bootstrap-salt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index e8fe1ea..7804091 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -1439,7 +1439,7 @@ __check_dpkg_architecture() {
                 warn_msg="Support for arm64 is experimental, make sure the custom repository used has the expected structure and contents."
             else
                 # Saltstack official repository does not yet have arm64 metadata,
-                # use amd64 repositories on arm64, since all pkgs are arch-independent
+                # use arm64 repositories on arm64, since all pkgs are arch-independent
                 __REPO_ARCH="arm64"
                 __REPO_ARCH_DEB="deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=$__REPO_ARCH]"
                 warn_msg="Support for arm64 packages is experimental and might rely on architecture-independent packages from the amd64 repository."

From 9629b2615270ef52403796c0fe7549d3a5aa1ec1 Mon Sep 17 00:00:00 2001
From: Jeff  Neel <10672501+jeff350@users.noreply.github.com>
Date: Wed, 14 Sep 2022 08:31:44 -0500
Subject: [PATCH 11/20] support format MAJOR-MINOR

---
 bootstrap-salt.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index bc497b7..4d9871c 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -639,6 +639,9 @@ elif [ "$ITYPE" = "onedir" ]; then
         if [ "$(echo "$1" | grep -E '^(latest)$')" != "" ]; then
             ONEDIR_REV="$1"
             shift
+	elif [ "$(echo "$1" | grep -E '^([3-9][0-9]{3}?-[0-9]$)')" != "" ]; then
+            ONEDIR_REV="minor/$1"
+            shift
         elif [ "$(echo "$1" | grep -E '^([3-9][0-9]{3}(\.[0-9]*)?)')" != "" ]; then
             # Handle the 3xxx.0 version as 3xxx archive (pin to minor) and strip the fake ".0" suffix
             ONEDIR_REV=$(echo "$1" | sed -E 's/^([3-9][0-9]{3})\.0$/\1/')

From 2ff7097facfa23ea77e1673beee45053fb8673c1 Mon Sep 17 00:00:00 2001
From: Jeff  Neel <10672501+jeff350@users.noreply.github.com>
Date: Thu, 15 Sep 2022 13:44:19 -0500
Subject: [PATCH 12/20] correct regex as requested

---
 bootstrap-salt.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 4d9871c..809085c 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -636,15 +636,13 @@ elif [ "$ITYPE" = "onedir" ]; then
     if [ "$#" -eq 0 ];then
         ONEDIR_REV="latest"
     else
-        if [ "$(echo "$1" | grep -E '^(latest)$')" != "" ]; then
+        if [ "$(echo "$1" | grep -E '^(latest|3005)$')" != "" ]; then
             ONEDIR_REV="$1"
             shift
-	elif [ "$(echo "$1" | grep -E '^([3-9][0-9]{3}?-[0-9]$)')" != "" ]; then
-            ONEDIR_REV="minor/$1"
-            shift
         elif [ "$(echo "$1" | grep -E '^([3-9][0-9]{3}(\.[0-9]*)?)')" != "" ]; then
             # Handle the 3xxx.0 version as 3xxx archive (pin to minor) and strip the fake ".0" suffix
             ONEDIR_REV=$(echo "$1" | sed -E 's/^([3-9][0-9]{3})\.0$/\1/')
+            ONEDIR_REV="minor/$ONEDIR_REV"
             shift
         else
             echo "Unknown stable version: $1 (valid: 3005, latest.)"

From 0ece40cd0fea1188188a9a7a89d84acf2d425ba7 Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@saltstack.com>
Date: Thu, 1 Sep 2022 13:05:48 -0700
Subject: [PATCH 13/20] Update the bootstrap script to work with final onedir
 releases.

---
 bootstrap-salt.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 19e4124..65e8f04 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -639,10 +639,10 @@ elif [ "$ITYPE" = "onedir" ]; then
         if [ "$(echo "$1" | grep -E '^(latest)$')" != "" ]; then
             ONEDIR_REV="$1"
             shift
-        elif [ "$(echo "$1" | grep -E '^([3-9][0-9]{3}(\.[0-9]*)?)$')" != "" ]; then
+        elif [ "$(echo "$1" | grep -E '^([3-9][0-9]{3}?-[0-9]$)')" != "" ]; then
             # Handle the 3xxx.0 version as 3xxx archive (pin to minor) and strip the fake ".0" suffix
-            ONEDIR_REV=$(echo "$1" | sed -E 's/^([3-9][0-9]{3})\.0$/\1/')
-            ONEDIR_REV="minor/$ONEDIR_REV"
+            #ONEDIR_REV=$(echo "$1" | sed -E 's/^([3-9][0-9]{3})\.0$/\1/')
+            ONEDIR_REV="minor/$1"
             shift
         else
             echo "Unknown stable version: $1 (valid: 3005, latest.)"
@@ -669,7 +669,7 @@ elif [ "$ITYPE" = "onedir_rc" ]; then
             ONEDIR_REV="minor/$1"
             shift
         else
-            echo "Unknown stable version: $1 (valid: 3005, latest.)"
+            echo "Unknown stable version: $1 (valid: 3005-1, latest.)"
             exit 1
         fi
     fi
@@ -4491,7 +4491,7 @@ enabled=1
 enabled_metadata=1
 _eof
 
-        fetch_url="${HTTP_VAL}://${_REPO_URL}/${_ONEDIR_DIR}/${__PY_VERSION_REPO}/redhat/${DISTRO_MAJOR_VERSION}/${CPU_ARCH_L}/"
+        fetch_url="${HTTP_VAL}://${_REPO_URL}/${_ONEDIR_DIR}/${__PY_VERSION_REPO}/redhat/${DISTRO_MAJOR_VERSION}/${CPU_ARCH_L}/${ONEDIR_REV}/"
         for key in $gpg_key; do
             __rpm_import_gpg "${fetch_url}${key}" || return 1
         done

From f95303449ce8df260cf7254389073a961343feaf Mon Sep 17 00:00:00 2001
From: Jeff  Neel <10672501+jeff350@users.noreply.github.com>
Date: Mon, 12 Sep 2022 23:10:12 -0500
Subject: [PATCH 14/20] strip .0

---
 bootstrap-salt.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 65e8f04..fa0b4bc 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -639,10 +639,9 @@ elif [ "$ITYPE" = "onedir" ]; then
         if [ "$(echo "$1" | grep -E '^(latest)$')" != "" ]; then
             ONEDIR_REV="$1"
             shift
-        elif [ "$(echo "$1" | grep -E '^([3-9][0-9]{3}?-[0-9]$)')" != "" ]; then
+        elif [ "$(echo "$1" | grep -E '^([3-9][0-9]{3}(\.[0-9]))')" != "" ]; then
             # Handle the 3xxx.0 version as 3xxx archive (pin to minor) and strip the fake ".0" suffix
-            #ONEDIR_REV=$(echo "$1" | sed -E 's/^([3-9][0-9]{3})\.0$/\1/')
-            ONEDIR_REV="minor/$1"
+            ONEDIR_REV=$(echo "$1" | sed -E 's/^([3-9][0-9]{3})\.0$/\1/')
             shift
         else
             echo "Unknown stable version: $1 (valid: 3005, latest.)"

From 6e1d3a8ab4be163233ea97acce406f224e208f8d Mon Sep 17 00:00:00 2001
From: Jeff  Neel <10672501+jeff350@users.noreply.github.com>
Date: Tue, 13 Sep 2022 00:14:46 -0500
Subject: [PATCH 15/20] fix regex

---
 bootstrap-salt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index fa0b4bc..957c8d0 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -639,7 +639,7 @@ elif [ "$ITYPE" = "onedir" ]; then
         if [ "$(echo "$1" | grep -E '^(latest)$')" != "" ]; then
             ONEDIR_REV="$1"
             shift
-        elif [ "$(echo "$1" | grep -E '^([3-9][0-9]{3}(\.[0-9]))')" != "" ]; then
+        elif [ "$(echo "$1" | grep -E '^([3-9][0-9]{3}(\.[0-9]*))')" != "" ]; then
             # Handle the 3xxx.0 version as 3xxx archive (pin to minor) and strip the fake ".0" suffix
             ONEDIR_REV=$(echo "$1" | sed -E 's/^([3-9][0-9]{3})\.0$/\1/')
             shift

From b8be8149bc238fd58b78e0e452634f09e7dc6096 Mon Sep 17 00:00:00 2001
From: Jeff  Neel <10672501+jeff350@users.noreply.github.com>
Date: Tue, 13 Sep 2022 00:31:59 -0500
Subject: [PATCH 16/20] fix regex

---
 bootstrap-salt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 957c8d0..bc497b7 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -639,7 +639,7 @@ elif [ "$ITYPE" = "onedir" ]; then
         if [ "$(echo "$1" | grep -E '^(latest)$')" != "" ]; then
             ONEDIR_REV="$1"
             shift
-        elif [ "$(echo "$1" | grep -E '^([3-9][0-9]{3}(\.[0-9]*))')" != "" ]; then
+        elif [ "$(echo "$1" | grep -E '^([3-9][0-9]{3}(\.[0-9]*)?)')" != "" ]; then
             # Handle the 3xxx.0 version as 3xxx archive (pin to minor) and strip the fake ".0" suffix
             ONEDIR_REV=$(echo "$1" | sed -E 's/^([3-9][0-9]{3})\.0$/\1/')
             shift

From 8e5464bbc494332b7f34775dbf7950ab46caadce Mon Sep 17 00:00:00 2001
From: Jeff  Neel <10672501+jeff350@users.noreply.github.com>
Date: Wed, 14 Sep 2022 08:31:44 -0500
Subject: [PATCH 17/20] support format MAJOR-MINOR

---
 bootstrap-salt.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index bc497b7..4d9871c 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -639,6 +639,9 @@ elif [ "$ITYPE" = "onedir" ]; then
         if [ "$(echo "$1" | grep -E '^(latest)$')" != "" ]; then
             ONEDIR_REV="$1"
             shift
+	elif [ "$(echo "$1" | grep -E '^([3-9][0-9]{3}?-[0-9]$)')" != "" ]; then
+            ONEDIR_REV="minor/$1"
+            shift
         elif [ "$(echo "$1" | grep -E '^([3-9][0-9]{3}(\.[0-9]*)?)')" != "" ]; then
             # Handle the 3xxx.0 version as 3xxx archive (pin to minor) and strip the fake ".0" suffix
             ONEDIR_REV=$(echo "$1" | sed -E 's/^([3-9][0-9]{3})\.0$/\1/')

From f741160d13e87ed1a74d9b375876d9788156ad30 Mon Sep 17 00:00:00 2001
From: Jeff  Neel <10672501+jeff350@users.noreply.github.com>
Date: Thu, 15 Sep 2022 13:44:19 -0500
Subject: [PATCH 18/20] correct regex as requested

---
 bootstrap-salt.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 4d9871c..809085c 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -636,15 +636,13 @@ elif [ "$ITYPE" = "onedir" ]; then
     if [ "$#" -eq 0 ];then
         ONEDIR_REV="latest"
     else
-        if [ "$(echo "$1" | grep -E '^(latest)$')" != "" ]; then
+        if [ "$(echo "$1" | grep -E '^(latest|3005)$')" != "" ]; then
             ONEDIR_REV="$1"
             shift
-	elif [ "$(echo "$1" | grep -E '^([3-9][0-9]{3}?-[0-9]$)')" != "" ]; then
-            ONEDIR_REV="minor/$1"
-            shift
         elif [ "$(echo "$1" | grep -E '^([3-9][0-9]{3}(\.[0-9]*)?)')" != "" ]; then
             # Handle the 3xxx.0 version as 3xxx archive (pin to minor) and strip the fake ".0" suffix
             ONEDIR_REV=$(echo "$1" | sed -E 's/^([3-9][0-9]{3})\.0$/\1/')
+            ONEDIR_REV="minor/$ONEDIR_REV"
             shift
         else
             echo "Unknown stable version: $1 (valid: 3005, latest.)"

From b7bd0f47f3906bdd79eb4cb458ea0f44b5a5368d Mon Sep 17 00:00:00 2001
From: pjcreath <pjcreath@users.noreply.github.com>
Date: Fri, 17 Jun 2022 20:58:32 +0000
Subject: [PATCH 19/20] Install Oracle's EPEL repo on Oracle Linux 7 and 8.

---
 bootstrap-salt.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 809085c..6eed0f7 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -5287,6 +5287,15 @@ install_red_hat_enterprise_workstation_testing_post() {
 #   Oracle Linux Install Functions
 #
 install_oracle_linux_stable_deps() {
+    # Install Oracle's EPEL.
+    if [ ${_EPEL_REPOS_INSTALLED} -eq $BS_FALSE ]; then
+        _EPEL_REPO=oracle-epel-release-el${DISTRO_MAJOR_VERSION}
+        if ! rpm -q "${_EPEL_REPO}" > /dev/null; then
+            __yum_install_noinput "${_EPEL_REPO}"
+        fi
+        _EPEL_REPOS_INSTALLED=$BS_TRUE
+    fi
+
     install_centos_stable_deps || return 1
     return 0
 }

From b1e153cdd0c92fa7fc84c1d1a19f841a45ee21d8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot] on behalf of s0undt3ch"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 4 Oct 2022 17:17:03 +0000
Subject: [PATCH 20/20] Update develop branch for the v2022.10.04 release

---
 CHANGELOG.md      | 17 +++++++++++++++++
 bootstrap-salt.sh |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15dbb0e..01c81cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,20 @@
+# v2022.10.04
+
+## What's Changed
+
+- Update README for Windows installation by @eozer in https://github.com/saltstack/salt-bootstrap/pull/1860
+- Update the bootstrap script to work with final onedir releases. by @garethgreenaway in https://github.com/saltstack/salt-bootstrap/pull/1863
+- Install Oracle's EPEL repo on Oracle Linux 7 and 8. by @pjcreath in https://github.com/saltstack/salt-bootstrap/pull/1839
+- onedir install - correct version regex by @jeff350 in https://github.com/saltstack/salt-bootstrap/pull/1868
+- Ensure the REPO_ARCH for Arm64 is correct. by @garethgreenaway in https://github.com/saltstack/salt-bootstrap/pull/1867
+
+## New Contributors
+
+- @eozer made their first contribution in https://github.com/saltstack/salt-bootstrap/pull/1860
+- @jeff350 made their first contribution in https://github.com/saltstack/salt-bootstrap/pull/1868
+
+**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2022.08.13...v2022.10.04
+
 # v2022.08.13
 
 ## What's Changed
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index ece071b..f6f714b 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -23,7 +23,7 @@
 #======================================================================================================================
 set -o nounset                              # Treat unset variables as an error
 
-__ScriptVersion="2022.08.13"
+__ScriptVersion="2022.10.04"
 __ScriptName="bootstrap-salt.sh"
 
 __ScriptFullName="$0"