From e1615ae23d893efe9848322bdc0f72dbdd65c802 Mon Sep 17 00:00:00 2001 From: alanw Date: Thu, 22 Jun 2023 12:30:11 -0700 Subject: [PATCH] modified python dependency resolution to use function --- extras/Slipstream.install | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extras/Slipstream.install b/extras/Slipstream.install index 7d2bfb0..6424e10 100755 --- a/extras/Slipstream.install +++ b/extras/Slipstream.install @@ -67,12 +67,12 @@ check-deps(){ done pybin=$(which python3) if [ -z $pybin ] ; then - run install-packages python3 python3-pip + bins_missing+=(python3) # TODO: make a universal package install function fi pipbin=$(which pip3) if [ -z $pipbin ] ; then - run install-packages python3-pip + bins_missing+=(pip3) fi for pkg in ${pip_packages[@]} ; do pippkg_installed=$(pip list | grep -F $pkg ; echo $?) @@ -91,7 +91,7 @@ check-deps(){ local _bins_missing=${#bins_missing[@]} # If higher than 0, return a fail (1) if [[ $_bins_missing != 0 ]] ; then - return 1 + return ${#_bins_missing} else return 0 fi