diff --git a/PRbL b/PRbL index d56848b..f61e810 160000 --- a/PRbL +++ b/PRbL @@ -1 +1 @@ -Subproject commit d56848bc3f35398117067ae083a9fc6573cf6703 +Subproject commit f61e81082922e314c573ca70a1ed08937a8373c0 diff --git a/extras/Slipstream.install b/extras/Slipstream.install index 16664f3..207a52a 100755 --- a/extras/Slipstream.install +++ b/extras/Slipstream.install @@ -54,11 +54,13 @@ check-deps(){ bins_missing+=($pkg) fi done - if ! $(which python3) ; then + pybin=$(which python3) + if [ -z $pybin ] ; then run sudo apt-get install -y python3 python3-pip # TODO: make a universal package install function fi - if ! $(which pip3) ; then + pipbin=$(which pip3) + if [ -z $pipbin ] ; then run sudo apt-get install -y python3-pip fi for pkg in ${pip_packages[@]} ; do @@ -70,8 +72,8 @@ check-deps(){ # This installer requires golang to work # TODO: better handling of prbl_packages as dependencies - - if ! $(which go) ; then + gobin=$(which go) + if [ -z $gobin ] ; then bins_missing+=("prbl: golang.install") fi # Count the number of entries in bins_missing