Changeset 37261

Timestamp:

2023-02-03T16:19:25+13:00 (15 months ago)

Author:

davidb

Message:

Script updated to work with self-contained Python3 extension

Location:

gs3-installations/eurovision-lod/trunk/sites/eurovision/collect/eurovision/prepare

Files:

• 05-PARSE-ADDITIONAL-METADATA-FROM-WIKIPEDIA.sh (modified) (3 diffs)
• 07b-GENERATE-ESSENTIA-FEATURES-DATA.sh (modified) (4 diffs)

gs3-installations/eurovision-lod/trunk/sites/eurovision/collect/eurovision/prepare/05-PARSE-ADDITIONAL-METADATA-FROM-WIKIPEDIA.sh

@@ -13 +13 @@
 prep_dir=errata-categories
 
-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
@@ -32 +32 @@
 exit_status=0
 
-source  ./$my_python/bin/activate
+if [ "x$PYTHON3_HOME" = "x" ] ; then    
+    source  ./$my_python/bin/activate
+fi
 
 $prep_dir/esc-wikipedia-download-and-process-votes.py \
@@ -73 +75 @@
 
 
-deactivate
+if [ "x$PYTHON3_HOME" = "x" ] ; then
+    deactivate
+fi
 
 if [ $exit_status != 0 ] ; then

gs3-installations/eurovision-lod/trunk/sites/eurovision/collect/eurovision/prepare/07b-GENERATE-ESSENTIA-FEATURES-DATA.sh

@@ -30 +30 @@
 echo ""
 
-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
@@ -40 +40 @@
 fi
 
-source  ./$my_python/bin/activate
-
+if [ "x$PYTHON3_HOME" = "x" ] ; then
+    source  ./$my_python/bin/activate
+fi
 
 echo ""
@@ -64 +65 @@
     echo "! Error enountered running git clone followed by pip3 install -r requirements.txt" 1>&2
     echo "!!!!" 1>&2
-    
-    deactivate
+
+    if [ "x$PYTHON3_HOME" = "x" ] ; then        
+        deactivate
+    fi
     exit 1
     fi
@@ -149 +152 @@
 
 
-
-
+if [ "x$PYTHON3_HOME" = "x" ] ; then        
+    deactivate
+fi