From 5a81283fca248578978589d4cc19b57e4a37699b Mon Sep 17 00:00:00 2001 From: Blake Harnden <32446120+bharnden@users.noreply.github.com> Date: Wed, 14 Sep 2022 21:03:24 -0700 Subject: [PATCH 1/2] install: added option to skip python system packages for setup.sh --- setup.sh | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/setup.sh b/setup.sh index 80f51b8e..de58f037 100755 --- a/setup.sh +++ b/setup.sh @@ -1,20 +1,23 @@ #!/bin/bash -# install pre-reqs using yum/apt PYTHON="${PYTHON:=python3}" PYTHON_DEP="${PYTHON_DEP:=python3}" -if command -v apt &> /dev/null -then - echo "setup to install CORE using apt" - sudo apt install -y ${PYTHON_DEP}-pip ${PYTHON_DEP}-venv -elif command -v yum &> /dev/null -then - echo "setup to install CORE using yum" - sudo yum install -y ${PYTHON_DEP}-pip -else - echo "apt/yum was not found" - echo "install python3, pip, venv, pipx, and invoke to run the automated install" - exit 1 + +# install pre-reqs using yum/apt +if [ -z "${NO_PYTHON}" ]; then + if command -v apt &> /dev/null + then + echo "setup to install CORE using apt" + sudo apt install -y ${PYTHON_DEP}-pip ${PYTHON_DEP}-venv + elif command -v yum &> /dev/null + then + echo "setup to install CORE using yum" + sudo yum install -y ${PYTHON_DEP}-pip + else + echo "apt/yum was not found" + echo "install python3, pip, venv, pipx, and invoke to run the automated install" + exit 1 + fi fi # install tooling for invoke based installation From 78eb03cc65eb4097a061d0afa6e12092da204ea9 Mon Sep 17 00:00:00 2001 From: Blake Harnden <32446120+bharnden@users.noreply.github.com> Date: Wed, 14 Sep 2022 22:43:33 -0700 Subject: [PATCH 2/2] install: updated option to skip system python packages for setup.sh to be more appropriately named --- setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.sh b/setup.sh index de58f037..94b2971c 100755 --- a/setup.sh +++ b/setup.sh @@ -4,7 +4,7 @@ PYTHON="${PYTHON:=python3}" PYTHON_DEP="${PYTHON_DEP:=python3}" # install pre-reqs using yum/apt -if [ -z "${NO_PYTHON}" ]; then +if [ -z "${NO_SYSTEM}" ]; then if command -v apt &> /dev/null then echo "setup to install CORE using apt"