From e1722645c5e516326edee6e1103c9240b0de9437 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Mon, 24 Apr 2023 10:25:46 -0500 Subject: [PATCH] shellcheck and whitespace --- scripts/ansible | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/ansible b/scripts/ansible index 377203480..fa92cae32 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -96,7 +96,7 @@ echo -e " /etc/apt/sources.list and /etc/apt/sources.list.d/*\n" echo -e "IIAB INSTALL INSTRUCTIONS: (OLDER, MANUAL APPROACH)" echo -e "https://github.com/iiab/iiab/wiki/IIAB-Installation#do-everything-from-scratch\n" -if [ $(command -v ansible) ]; then # "command -v" is POSIX compliant; also catches built-in commands like "cd" +if [ "$(command -v ansible)" ]; then # "command -v" is POSIX compliant; also catches built-in commands like "cd" CURR_VER=$(ansible --version | head -1 | cut -f 2- -d " ") # Above works with 'ansible [core 2.11.0rc2]' -- these old ways do not: #CURR_VER=$(ansible --version | head -1 | awk '{print $2}') @@ -201,14 +201,13 @@ $APT_PATH/apt -y install python3-venv # 2023-03-22: OS's like Ubuntu 23.04 and Debian 12 (e.g. with Python 3.11+) ask # that virtual environments (venv) be used to safely isolate pip installs: -# https://peps.python.org/pep-0668 +# https://peps.python.org/pep-0668 echo -e "\nCreate virtual environment for Ansible" python3 -m venv /usr/local/ansible /usr/local/ansible/bin/python3 -m pip install --upgrade ansible-core echo -e "\nCreate symlinks /usr/local/bin/ansible* -> /usr/local/ansible/bin/ansible*" -cd /usr/local/ansible/bin -for bin in $(ls ansible*); do - ln -sf /usr/local/ansible/bin/$bin /usr/local/bin/$bin +for bin in /usr/local/ansible/bin/ansible*; do + ln -sf /usr/local/ansible/bin/"$bin" /usr/local/bin/"$bin" done # (Re)running collection installs appears safe, with --force-with-deps to force