Make metadata generation shell script more portable

Author: niermann999

detectors/CMakeLists.txt

@@ -47,7 +47,7 @@ if(NOT "${DETRAY_GENERATE_METADATA}" STREQUAL "")
             OUTPUT "${GENERATED_HEADER}"
             COMMAND
                 ${CMAKE_CURRENT_SOURCE_DIR}/generate_metadata.sh -m
-                ${GENERATOR_SCRIPT} -o ${OUTPUT_DIR} -b ${CMAKE_BINARY_DIR}
+                ${GENERATOR_SCRIPT} -o ${OUTPUT_DIR} -p ${CMAKE_BINARY_DIR}
             DEPENDS
                 "${GENERATOR_SCRIPT}"
                 "${PROJECT_SOURCE_DIR}/detectors/generate_metadata.sh"

detectors/generate_metadata.sh

@@ -4,6 +4,8 @@
 #
 # Mozilla Public License Version 2.0
 
+#!/bin/sh
+
 # Print help message
 print_help()
 {
@@ -23,8 +25,8 @@ print_help()
 log_lvl=0
 
 # Parse options
-while getopts ":hvb:vv:m:o:" opt; do
-    case $opt in
+while getopts ":hvp:vv:m:o:" opt; do
+    case ${opt} in
         h)
             echo "Generate custom detray Detector Metadata"
             echo
@@ -34,27 +36,40 @@ while getopts ":hvb:vv:m:o:" opt; do
         v)
             ((log_lvl++))
         ;;
-        b)
-            build_dir=$OPTARG
+        p)
+            python_dir=${OPTARG}
         ;;
         m)
-            metadata_generator=$OPTARG
+            metadata_generator=${OPTARG}
         ;;
         o)
-            out_dir=$OPTARG
+            out_dir=${OPTARG}
         ;;
         \?)
          echo
-         echo "ERROR: Invalid option $opt! Usage:"
+         echo "ERROR: Invalid option ${opt}! Usage:"
          echo
          print_help
          exit;;
     esac
 done
 
-python_command="python $metadata_generator"
+# Check how to invoke the python interpreter
+python_command="python3"
+if [ ! type {$python_command} > /dev/null ]; then
+    # Try again
+    python_command="python"
+    if [ ! type {$python_command} > /dev/null ]; then
+        echo
+        echo "ERROR: No python command found: exiting"
+        echo
+        exit
+    fi
+fi
+
+generator_command="${python_command} ${metadata_generator}"
 
-if [[ -z "$metadata_generator" ]];then
+if [ -z "${metadata_generator}" ];then
     echo
     echo "ERROR: No detector metadata scrip supplied! Usage:"
     echo
@@ -63,19 +78,19 @@ if [[ -z "$metadata_generator" ]];then
 fi
 
 # Configure verbosity
-if [[ $log_lvl == 1 ]]; then
-    python_command="$python_command -v"
-elif [[ $log_lvl == 2 ]]; then
-    python_command="$python_command -vv"
+if [ ${log_lvl} -eq 1 ]; then
+    generator_command="${generator_command} -v"
+elif [ ${log_lvl} -eq 2 ]; then
+    generator_command="${generator_command} -vv"
 fi
 
 # Add the option for the custom output location
-if [[ ! -z "$out_dir" ]]; then
-    python_command="$python_command -o $out_dir"
+if [ ! -z "${out_dir}" ]; then
+    generator_command="${generator_command} -o ${out_dir}"
 fi
 
-# Set uo the detray python package
-source $build_dir/python/setup.sh
+# Set up the detray python package
+export PYTHONPATH="${python_dir}/python":$PYTHONPATH
 
 # Run the generation of the requested metadata
-eval $python_command
+eval ${generator_command}