Changeset 34379

Timestamp:

2020-09-14T18:37:54+12:00 (4 years ago)

Author:

davidb

Message:

Some further refinement of what to print out, after some initial testing

File:

• gs3-extensions/mars-src/trunk/SETUP.sh (modified) (1 diff)

gs3-extensions/mars-src/trunk/SETUP.sh

@@ -4 +4 @@
 source ./gs3-setup.sh
 
-if [ ! -d "$GEXT_MARS_INSTALLED/virtualenv-python3/lib/python3.7/site-packages/sklearn" ] ; then
-    echo "!!!!" >&2
-    echo "! Failed to find directory: " >&2
-    echo "!   $GEXT_MARS_INSTALLED/virtualenv-python3/lib/python3.7/site-packages/sklearn" ] >&2
-    echo "!!!!" >&2
-    echo "! You need to: " >&2
-    echo "!   source \$GEXT_MARS/darwin/virtualenv-python3/bin/activate" >&2
-    echo "! Then: " >&2
-    echo "!   pip install sklearn" >&2
-    echo "!!!!" >&2
-    exit 1
+function check_pip_installed()
+{
+    if [ ! -d "$GEXT_MARS_INSTALLED/virtualenv-python3/lib/python3.7/site-packages/$1" ] \
+    && [ ! -f "$GEXT_MARS_INSTALLED/virtualenv-python3/lib/python3.7/site-packages/$1.py" ] ; then
+    echo "!!!!" >&2
+    echo "! Failed to find directory or file: " >&2
+    echo "!   $GEXT_MARS_INSTALLED/virtualenv-python3/lib/python3.7/site-packages/$1(.py)" >&2
+    echo "!!!!" >&2
+    echo "! You need to: " >&2
+    if [ "x$VIRTUAL_ENV" = "x" ] ; then
+        echo "!   source $GEXT_MARS/darwin/virtualenv-python3/bin/activate" >&2
+        echo "! Then: " >&2
+    fi
+    echo "!   pip install $1" >&2
+    echo "!!!!" >&2
+    
+    return 1
+    fi
+}
+
+function check_pip_installed_all()
+{
+    for pkg in six sklearn matplotlib ; do
+    check_pip_installed $pkg
+    if [ $? != 0 ] ; then
+        return 1
+    fi
+    done
+}
+
+
+check_pip_installed_all
+
+if [ $? != 0 ] ; then
+    return 1
 fi
 
-echo ""
-echo "****"
-echo "* Activating Python v3 Virtual Env "
-echo "****"
-echo ""
+if [ "x$VIRTUAL_ENV" = "x" ] ; then
 
-source $GEXT_MARS_INSTALLED/virtualenv-python3/bin/activate
+    echo ""
+    echo "****"
+    echo "* Activating Python v3 Virtual Env "
+    echo "****"
+    echo ""
 
+    source $GEXT_MARS_INSTALLED/virtualenv-python3/bin/activate
+fi
+