modified python dependency resolution to use function
This commit is contained in:
parent
05607f2538
commit
e1615ae23d
1 changed files with 3 additions and 3 deletions
|
|
@ -67,12 +67,12 @@ check-deps(){
|
||||||
done
|
done
|
||||||
pybin=$(which python3)
|
pybin=$(which python3)
|
||||||
if [ -z $pybin ] ; then
|
if [ -z $pybin ] ; then
|
||||||
run install-packages python3 python3-pip
|
bins_missing+=(python3)
|
||||||
# TODO: make a universal package install function
|
# TODO: make a universal package install function
|
||||||
fi
|
fi
|
||||||
pipbin=$(which pip3)
|
pipbin=$(which pip3)
|
||||||
if [ -z $pipbin ] ; then
|
if [ -z $pipbin ] ; then
|
||||||
run install-packages python3-pip
|
bins_missing+=(pip3)
|
||||||
fi
|
fi
|
||||||
for pkg in ${pip_packages[@]} ; do
|
for pkg in ${pip_packages[@]} ; do
|
||||||
pippkg_installed=$(pip list | grep -F $pkg ; echo $?)
|
pippkg_installed=$(pip list | grep -F $pkg ; echo $?)
|
||||||
|
|
@ -91,7 +91,7 @@ check-deps(){
|
||||||
local _bins_missing=${#bins_missing[@]}
|
local _bins_missing=${#bins_missing[@]}
|
||||||
# If higher than 0, return a fail (1)
|
# If higher than 0, return a fail (1)
|
||||||
if [[ $_bins_missing != 0 ]] ; then
|
if [[ $_bins_missing != 0 ]] ; then
|
||||||
return 1
|
return ${#_bins_missing}
|
||||||
else
|
else
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue