From 78c22d3df58ac39abb5ec66bdc937c2b77d60611 Mon Sep 17 00:00:00 2001
From: root <holta@users.noreply.github.com>
Date: Mon, 24 Apr 2023 13:07:24 -0400
Subject: [PATCH] scripts/ansible: 2.14.5, cryptography==40.0.1 on armhf,
 for-loop fix

---
 scripts/ansible | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/scripts/ansible b/scripts/ansible
index 76a00b777..ed368d1e6 100755
--- a/scripts/ansible
+++ b/scripts/ansible
@@ -7,8 +7,8 @@
 # https://github.com/iiab/iiab/wiki/Technical-Contributors-Guide#female_detective-understanding-ansible
 
 APT_PATH=/usr/bin     # Avoids problematic /usr/local/bin/apt on Linux Mint
-CURR_VER=undefined    # Ansible version you have installed, e.g. [core 2.14.4]
-GOOD_VER=2.14.4       # Orig for 'yum install [rpm]' & XO laptops (pip install)
+CURR_VER=undefined    # Ansible version you have installed, e.g. [core 2.14.5]
+GOOD_VER=2.14.5       # Orig for 'yum install [rpm]' & XO laptops (pip install)
 
 # 2021-06-22: The apt approach (with PPA source in /etc/apt/sources.list.d/ and
 # .gpg key etc) are commented out with ### below.  Associated guidance/comments
@@ -205,14 +205,21 @@ $APT_PATH/apt -y install python3-venv
 echo -e "\nCreate virtual environment for Ansible"
 python3 -m venv /usr/local/ansible
 
-# Same detection as local_facts.fact https://github.com/iiab/iiab/issues/3547
-if [ -f /etc/rpi-issue ] && [ "$(dpkg --print-architecture)" = armhfp ]; then
+# "if not ubuntu" (covers RasPiOC & Debian) would also work, but is overbroad:
+# if ! grep -qi ubuntu /etc/os-release; then
+#
+# if [ -f /etc/rpi-issue ] && [[ $(dpkg --print-architecture) == armhf ]]; then
+#
+# 2023-03-24 #3547 similar to #3459 re: cryptography, piwheels, rust.
+# Release problems chart: https://www.piwheels.org/project/cryptography/
+if [[ $(dpkg --print-architecture) == armhf ]]; then    # 32-bit ARM
     /usr/local/ansible/bin/python3 -m pip install cryptography==40.0.1
 fi
 
 /usr/local/ansible/bin/python3 -m pip install --upgrade ansible-core
 echo -e "\nCreate symlinks /usr/local/bin/ansible* -> /usr/local/ansible/bin/ansible*"
-for bin in /usr/local/ansible/bin/ansible*; do
+cd /usr/local/ansible/bin
+for bin in ansible*; do
     ln -sf /usr/local/ansible/bin/"$bin" /usr/local/bin/"$bin"
 done