Fix pip detection

This commit is contained in:
Cyryl Płotnicki 2016-11-03 20:55:20 +01:00
parent 70017cf7b7
commit 9bae034719

View file

@ -170,15 +170,20 @@ $SUDO npm install -g reveal-md
echo "Installing fancy differ" echo "Installing fancy differ"
$SUDO npm install -g diff-so-fancy $SUDO npm install -g diff-so-fancy
if [[ -z $NOPYTHON3 ]]; then
pip3_path=`which pip3` pip3_path=`which pip3`
if [[ -z $NOPYTHON3 && -x pip3_path ]]; then echo "pip3 path is $pip3_path"
if [[ -x pip3_path ]]; then
echo "Choosing pip3 for pip"
PIP=pip3 PIP=pip3
else else
echo "Choosing pip"
PIP=pip PIP=pip
fi fi
echo "Installing Nikola" echo "Installing Nikola"
$SUDO $PIP install pygments-style-solarized ws4py watchdog webassets Nikola $SUDO $PIP install pygments-style-solarized ws4py watchdog webassets Nikola
fi
fi
if [[ -z $USER ]]; then if [[ -z $USER ]]; then
USER=`whoami` USER=`whoami`