From 6a2953a3bc38a8750cfd792a9c684bf26404c672 Mon Sep 17 00:00:00 2001
From: Max! <admin@cloudydev.net>
Date: Sat, 25 Feb 2023 19:31:36 +0100
Subject: [PATCH] Allow script to run without manual input after first 'yes'
 (#164)

* move pip install logic outside of python install block

* adds pipx installation functionality

* makes script run autonomously after initial yes response

* bump version

---------

Co-authored-by: friend <friend@big-bradley.lan>
---
 pyproject.toml |  2 +-
 setup.sh       | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 50634b88..859e9586 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name          = "onboardme"
-version       = "0.18.3"
+version       = "0.18.4"
 description   = "Install dot files and packages, including a base mode with sensible defaults to run on most computers running Debian based distros or macOS."
 authors       = ["Jesse Hitch <jessebot@linux.com>"]
 license       = "AGPL-3.0-or-later"
diff --git a/setup.sh b/setup.sh
index d9447809..2914615c 100755
--- a/setup.sh
+++ b/setup.sh
@@ -50,7 +50,7 @@ else
     echo "Git not installed or in path, attempting to install git..."
     # we use *"linux"* because linux2 is a possibility, and who knows what else
     if [[ "$OS" == "Linux"* ]]; then
-        sudo apt install git
+        DEBIAN_FRONTEND=noninteractive sudo apt-get install -y git
         git_return_code=$?
         if [ $git_return_code -ne 0 ]; then
             echo "Git didn't install. This may be because you don't have main branch"
@@ -123,7 +123,7 @@ which brew > /dev/null
 brew_return_code=$?
 if [ $brew_return_code -ne 0 ]; then
     echo "Installing brew really quick, this will require your credentials for sudo abilities..."
-    /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+    NONINTERACTIVE=1 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
     echo -e "\033[92mBrew installed :3 \033[00m"
 else
     echo -e "\033[92mBrew already installed :3 \033[00m"
@@ -143,7 +143,8 @@ if [ $py_return_code -ne 0 ]; then
     	echo -e "\033[92mPython3.11 installed :3 \033[00m"
     else
 	echo "Installing Python3.11 via apt..."
-        sudo apt install software-properties-common -y
+        DEBIAN_FRONTEND=noninteractive && \ 
+	sudo apt-get install software-properties-common -y && \
         sudo add-apt-repository ppa:deadsnakes/ppa
         sudo apt install python3.11
         curl -sS https://bootstrap.pypa.io/get-pip.py | python3.11
@@ -155,7 +156,9 @@ else
     pip_return_code=$?
     if [ $pip_return_code -ne 0 ]; then
         echo -e "\033[92mInstalling pip via apt... \033[00m"
-        sudo apt-get update && sudo apt-get install -y python3-pip pipx python3-venv
+        DEBIAN_FRONTEND=noninteractive && \
+	sudo apt-get update && \
+	sudo apt-get install -y python3-pip pipx python3-venv
         pipx ensurepath
 	echo -e "\033[92mPip3.11 installed :3 \033[00m"
     fi