From d90227e066ff6c0d34c7fc96f9989ddefca6e8b3 Mon Sep 17 00:00:00 2001
From: root <holta@users.noreply.github.com>
Date: Fri, 17 Mar 2023 22:53:22 -0400
Subject: [PATCH] venv WIP: scripts/ansible & kalite/tasks/install.yml

---
 roles/kalite/tasks/install.yml | 2 +-
 scripts/ansible                | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/roles/kalite/tasks/install.yml b/roles/kalite/tasks/install.yml
index 6f359395d..5fb192475 100644
--- a/roles/kalite/tasks/install.yml
+++ b/roles/kalite/tasks/install.yml
@@ -15,7 +15,7 @@
     name:
       - python2
       - python-setuptools    # Provides setuptools-44 on recent OS's (last version compatible with python2)
-      - virtualenv           # For Ansible module 'pip' when used with 'virtualenv_command: /usr/bin/virtualenv' and 'virtualenv_python: python2.7' -- compare package 'python3-venv' used by roles {calibre-web, jupyterhub, lokole}
+      - virtualenv           # Drags in 'python3-virtualenv' which in turn drags in 'python3-pip' -- for Ansible module 'pip' when used with 'virtualenv_command: /usr/bin/virtualenv' and 'virtualenv_python: python2.7' -- compare package 'python3-venv' used by roles {calibre-web, jupyterhub, lokole}
     state: present
   #when: not (is_debian_9 or is_debian_10 or is_ubuntu_16 or is_ubuntu_17 or is_ubuntu_18 or is_ubuntu_19)
   # 2020-03-31: Testing for {is_raspbian_9, is_raspbian_10} is not currently nec, as testing for {is_debian_9, is_debian_10} covers that already.
diff --git a/scripts/ansible b/scripts/ansible
index 0b88f97f1..d3dda04af 100755
--- a/scripts/ansible
+++ b/scripts/ansible
@@ -160,7 +160,7 @@ fi
 ###echo -e 'ENSURE ANSIBLE UPDATES CLEANLY: (then re-run this script to be sure!)\n'
 ###grep '^deb .*ansible' /etc/apt/sources.list /etc/apt/sources.list.d/*.list | grep -v '^/etc/apt/sources.list.d/iiab-ansible.list:' || true    # Override bash -e (instead of aborting at 1st error)
 
-#echo -e "\napt update; apt install python3-pip   # Also installs 'python3-setuptools' and 'python3' etc"
+#echo -e "\napt update; apt install python3-pip    # Also installs 'python3-setuptools' and 'python3' etc"
 #echo -e "https://github.com/iiab/iiab/blob/master/scripts/ansible.md\n"
 #$APT_PATH/apt update
 #$APT_PATH/apt -y install python3-pip
@@ -183,7 +183,7 @@ fi
 # cache system-wide before installing:
 # https://stackoverflow.com/questions/9510474/removing-pips-cache/61762308#61762308
 # https://github.com/iiab/iiab/pull/3022
-pip3 config --global set global.no-cache-dir false
+#pip3 config --global set global.no-cache-dir false
 
 #if ! uname -m | grep -q 64; then
     # echo "2022-11-09: ansible-core 2.12.10+ PPA works on 32-bit RasPiOS, using /etc/apt/sources.list.d/iiab-ansible.list, until upstream wheels -> cryptography is fixed (PR #3421)"
@@ -199,10 +199,10 @@ echo -e "\napt update; apt install python3-venv"
 $APT_PATH/apt update
 $APT_PATH/apt -y install python3-venv
 
-echo -e "Create virtual environment for ansible"
+echo -e "Create virtual environment for Ansible"
 python3 -m venv /usr/local/ansible
 /usr/local/ansible/bin/python3 -m pip install --upgrade ansible-core
-echo -e "Place ansible on path using symlinks"
+echo -e "Create 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