Changeset 37260

Timestamp:

2023-02-03T16:18:17+13:00 (15 months ago)

Author:

davidb

Message:

Script updated to work with self-contained Python3 extension

File:

• gs3-installations/eurovision-lod/trunk/sites/eurovision/collect/eurovision/prepare/03-GEN-VOTING-METADATA.sh (modified) (3 diffs)

gs3-installations/eurovision-lod/trunk/sites/eurovision/collect/eurovision/prepare/03-GEN-VOTING-METADATA.sh

@@ -5 +5 @@
 prep_dir=voting-excel
 
-if [ ! -d "./$my_python" ] ; then
+if [ "x$PYTHON3_HOME" = "x" ] && [ ! -d "./$my_python" ] ; then
     echo "" 1>&2
     echo "Failed to find: ./$my_python" 1>&2
@@ -48 +48 @@
 exit_status=0
 
-source  ./$my_python/bin/activate
+if [ "x$PYTHON3_HOME" = "x" ] ; then    
+    source  ./$my_python/bin/activate
+fi
 
 $prep_dir/xlsx-fromcountry-jsonmetadata.py \
@@ -100 +102 @@
 
 
-deactivate
+if [ "x$PYTHON3_HOME" = "x" ] ; then    
+    deactivate
+fi
 
 if [ $exit_status != 0 ] ; then