From 3c6f40a62d3593724855502fc3ca3c0801aa5be2 Mon Sep 17 00:00:00 2001
From: "Kenneth Benzie (Benie)" <benie@infektor.net>
Date: Sun, 13 Nov 2022 16:09:48 +0000
Subject: [PATCH] temp!

---
 bootstrap-Debian.sh | 37 ++++++++++++++-----------------------
 1 file changed, 14 insertions(+), 23 deletions(-)

diff --git a/bootstrap-Debian.sh b/bootstrap-Debian.sh
index 1bbdb95..aa9e009 100755
--- a/bootstrap-Debian.sh
+++ b/bootstrap-Debian.sh
@@ -59,46 +59,37 @@ agree() {
 }
 
 apt_install() {
-  sudo apt install --yes --install-recommends $1 > /dev/null
+  sudo apt-get install --yes --install-recommends $1 > /dev/null
 }
 
 pip_install() {
-  pip install --user $1 > /dev/null
+  pip3 install --user $1 > /dev/null
 }
 
 export PATH=~/.local/bin:$PATH
 
-agree "Update apt cache" && sudo apt update > /dev/null
-agree "Upgrade apt packages" "N" && sudo apt upgrade > /dev/null
-
 missing git && agree "Install git" && apt_install git
 
-if missing pip; then
-  agree "Install python-pip" && apt_install python-pip
-  agree "Upgrade pip with pip" && \
-    sudo -H pip_install --upgrade pip > /dev/null
+if missing python; then
+  agree "Intsall python-is-python3" && apt_install python-is-python3
 fi
 
-missing virtualenv && agree "Install virtualenv" && pip_install virtualenv
+if missing pip3; then
+  agree "Install python-pip" && apt_install python3-pip
+fi
+
+if missing virtualenv; then
+  agree "Install python3-virtualenv" && apt_install python3-virtualenv
+fi
 
 if [ ! -f ~/.ssh/id_rsa ] && agree "Generate SSH key"; then
   read -rp "SSH email: " email
   [ ! -d ~/.ssh ] && mkdir -p ~/.ssh
-  ssh-keygen -t rsa -b 4096 -C "$email" -N "" -f ~/.ssh/id_rsa
+  ssh-keygen -t ed25519 -C "$email" -N "" -f ~/.ssh/id_rsa
 fi
 
-if ! missing virtualenv && agree "Set SSH keys on remote Git servers"; then
-  env=$(mktemp -d)
-  virtualenv $env > /dev/null
-  source $env/bin/activate
-  pip install git+https://code.infektor.net/config/bootstrap.git > /dev/null
-  python -c 'import bootstrap; bootstrap.set_ssh_keys()'
-  deactivate
-  rm -r $env
-fi
-
-missing conduit && agree "Install conduit" && \
-  pip_install git+ssh://git@github.com/kbenzie/conduit.git
+missing conduit && agree "Install ansible" && \
+  pip_install ansible
 
 echo "To use installed pip packages update your PATH:"
 echo 'export PATH=~/.local/bin:$PATH'