Fix pip detection

common/configure_fresh_system

@@ -170,15 +170,20 @@ $SUDO npm install -g reveal-md
 echo "Installing fancy differ"
 $SUDO npm install -g diff-so-fancy
 
+if [[ -z $NOPYTHON3 ]]; then
     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
     else
+        echo "Choosing pip"
         PIP=pip
     fi
-
     echo "Installing Nikola"
     $SUDO $PIP install pygments-style-solarized ws4py watchdog webassets Nikola
+    fi
+fi
 
 if [[ -z $USER ]]; then
     USER=`whoami`