Merge branch 'master' into barebones_launching

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
@@ -63,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.)
 	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

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]