From ce4971d31d802e5f514f6402b33f6392f1824d94 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jan 2024 21:53:34 +0000
Subject: [PATCH 1/3] Bump shlex from 1.2.0 to 1.3.0 in /scripts/completion

Bumps [shlex](https://github.com/comex/rust-shlex) from 1.2.0 to 1.3.0.
- [Changelog](https://github.com/comex/rust-shlex/blob/master/CHANGELOG.md)
- [Commits](https://github.com/comex/rust-shlex/commits)

---
updated-dependencies:
- dependency-name: shlex
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 scripts/completion/Cargo.lock | 4 ++--
 scripts/completion/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/completion/Cargo.lock b/scripts/completion/Cargo.lock
index 6be4b07b..20f47a4a 100644
--- a/scripts/completion/Cargo.lock
+++ b/scripts/completion/Cargo.lock
@@ -209,9 +209,9 @@ dependencies = [
 
 [[package]]
 name = "shlex"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "simplelog"
diff --git a/scripts/completion/Cargo.toml b/scripts/completion/Cargo.toml
index 6755434c..90cdfd5c 100644
--- a/scripts/completion/Cargo.toml
+++ b/scripts/completion/Cargo.toml
@@ -11,7 +11,7 @@ serde_json = "1.0.59"
 dirs = "4.0.0"
 log = "0.4.14"
 simplelog = "0.12.0"
-shlex = "1.1.0"
+shlex = "1.3.0"
 itertools = "0.10.5"
 
 [profile.release]

From 55b6777ca711bf0f4f01913198b1acf85fbf4272 Mon Sep 17 00:00:00 2001
From: Frederick Deny <fdeny@uoregon.edu>
Date: Mon, 5 Feb 2024 19:13:42 +0000
Subject: [PATCH 2/3] update Makefile for building support of aarch64

---
 Makefile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 94776525..25b30614 100644
--- a/Makefile
+++ b/Makefile
@@ -48,10 +48,14 @@ ifeq ($(HOST_ARCH),x86_64)
 else
 	ifeq ($(HOST_ARCH),ppc64le)
 	CONDA_ARCH = ppc64le
+else
+	ifeq ($(HOST_ARCH),aarch64)
+	CONDA_ARCH = aarch64
 else
 	USE_MINICONDA = false
 endif
 endif
+endif
 
 CONDA_VERSION = latest
 CONDA_REPO = https://repo.anaconda.com/miniconda
@@ -66,14 +70,14 @@ ifeq ($(USE_MINICONDA),true)
 	PYTHON_EXE = $(CONDA)
 	PYTHON_FLAGS = -EOu
 else
-	$(warning WARNING: There are no miniconda packages for this system: $(HOST_OS), $(HOST_ARCH).)
+    $(warning WARNING: There are no miniconda packages for this system: $(HOST_OS), $(HOST_ARCH).)
 	CONDA_SRC =
 	PYTHON_EXE = $(shell command -pv python || type -P python || which python)
 	PYTHON_FLAGS = -O
 	ifeq ($(PYTHON_EXE),)
-		$(error python not found in PATH.)
+        $(error python not found in PATH.)
 	else
-		$(warning WARNING: Trying to use '$(PYTHON_EXE)' instead.)
+        $(warning WARNING: Trying to use '$(PYTHON_EXE)' instead.)
 	endif
 endif
 PYTHON = $(PYTHON_EXE) $(PYTHON_FLAGS)

From 045ba0c7081083b9b5fe53d9aa5d83301ace1f5c Mon Sep 17 00:00:00 2001
From: Frederick Deny <fdeny@uoregon.edu>
Date: Mon, 5 Feb 2024 20:34:03 +0000
Subject: [PATCH 3/3] corrected syntax issues with tabs/spaces that crashed the
 process when encountering a warning, removed type -P method as it wasn't
 functionning within the shell call, added search for python3 if search for
 python failed

---
 Makefile | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 25b30614..45a50734 100644
--- a/Makefile
+++ b/Makefile
@@ -67,19 +67,23 @@ CONDA_BIN = $(CONDA_DEST)/bin
 CONDA = $(CONDA_DEST)/bin/python
 
 ifeq ($(USE_MINICONDA),true)
-	PYTHON_EXE = $(CONDA)
-	PYTHON_FLAGS = -EOu
+PYTHON_EXE = $(CONDA)
+PYTHON_FLAGS = -EOu
 else
-    $(warning WARNING: There are no miniconda packages for this system: $(HOST_OS), $(HOST_ARCH).)
-	CONDA_SRC =
-	PYTHON_EXE = $(shell command -pv python || type -P python || which python)
-	PYTHON_FLAGS = -O
+$(warning WARNING: There are no miniconda packages for this system: $(HOST_OS), $(HOST_ARCH).)
+CONDA_SRC =
+PYTHON_EXE = $(shell command -pv python || which python)
+PYTHON_FLAGS = -O
+ifeq ($(PYTHON_EXE),)
+	PYTHON_EXE = $(shell command -pv python3 || which python3)
 	ifeq ($(PYTHON_EXE),)
-        $(error python not found in PATH.)
-	else
-        $(warning WARNING: Trying to use '$(PYTHON_EXE)' instead.)
+		$(error python not found in PATH.)
 	endif
+else
+	$(warning WARNING: Trying to use '$(PYTHON_EXE)' instead.)
 endif
+endif
+
 PYTHON = $(PYTHON_EXE) $(PYTHON_FLAGS)
 
 # Completion folder resolution from https://github.com/scop/bash-completion#faq