system-wide verify

make-functions.sh

@@ -33,19 +33,23 @@ function upgrade-oda-python() {
     $PIP install --upgrade pyyaml --user || pip install --upgrade pyyaml \
         || { echo -e "\033[31missue updating python module of pyyaml from $DIR!\033[0m"; exit 1; }
 
-    oda-cc version -c $DIR || {
-        $PIP install --upgrade ${DIR} --user || pip install --upgrade ${DIR} \
-            || { echo -e "\033[31missue updating python module for ci-tempalte-cc from $DIR!\033[0m"; exit 1; }
-    }
+    if [ -s $DIR/setup.py ]; then
+        oda-cc version -c $DIR || {
+            $PIP install --upgrade ${DIR} --user || pip install --upgrade ${DIR} \
+                || { echo -e "\033[31missue updating python module for ci-tempalte-cc from $DIR!\033[0m"; exit 1; }
+        }
 
-    REQ_NB2W=$(< requirements.txt grep nb2workflow | tee req_nb2w.txt)
+        REQ_NB2W=$(< requirements.txt grep nb2workflow | tee req_nb2w.txt)
 
-    if [ "$REQ_NB2W"x == ""x ]; then
-        nb2workflow-version > req_nb2w.txt
-        REQ_NB2W=$(cat req_nb2w.txt)
-    fi
+        if [ "$REQ_NB2W"x == ""x ]; then
+            nb2workflow-version > req_nb2w.txt
+            REQ_NB2W=$(cat req_nb2w.txt)
+        fi
 
-    $PIP freeze | grep nb2w | grep $(cat req_nb2w.txt) || $PIP install -r req_nb2w.txt
+        $PIP freeze | grep nb2w | grep $(cat req_nb2w.txt) || $PIP install -r req_nb2w.txt
+    else
+        echo -e "\033[34mNOTE: no python module in script directory - probably system-wide install, not verifying"
+    fi
 
     NB2WORKFLOW_VERSION=$(nb2workflow-version)
 }
@@ -377,8 +381,8 @@ function submit-all-scw() {
 }
 
 function submit-all-cases() {
-    icversion=${1:?}   
-    nmax=${2:?}
+    icversion=${1:?icversion}   
+    nmax=${2:?nmax}
 
     oda-node version -v || {
         echo -e "\033[31mfailed to connect to ODAHUB\033[0m"