Further renaming in main.sh (BMK-118)

Further renaming in main.sh (BMK-118)

build-executor/generate_Dockerfile.sh

+if [ "$BASH_SOURCE" = "$0" ]; then echo "ERROR! This script ($0) was not sourced"; exit 1; fi
+if [ "$BASH_SOURCE" = "" ]; then echo "ERROR! This script was not sourced from bash"; return 1; fi
+echo "[$(basename ${BASH_SOURCE})] Loading functions from $(basename ${BASH_SOURCE})"
+###if [ "$(type -t generate_Dockerfile)" == "function" ]; then echo "WARNING! Function generate_Dockerfile already loaded"; fi
+
+
 # Generate workload-specific Dockerfile from the workload-specific Dockerfile.template,
 # using the environment variables HEPWL_xxx defined in the workload-specific spec file.
 # Input arguments: -s <full path to HEP workload spec file> -d <full path to Dockerfile template>.
@@ -26,8 +32,8 @@ function generate_Dockerfile(){
     esac
   done
 
-  echo "[generate_Dockerfile] Input hepwlSpecFile: $hepwlSpecFile"
-  echo "[generate_Dockerfile] Input dockerTemplate: $dockerTemplate"
+  echo "[${FUNCNAME[0]}] Input hepwlSpecFile: $hepwlSpecFile"
+  echo "[${FUNCNAME[0]}] Input dockerTemplate: $dockerTemplate"
 
   if [ "$hepwlSpecFile" == "" ]; then
     echo "ERROR! Not specified: hepwlSpecFile"
@@ -61,6 +67,6 @@ function generate_Dockerfile(){
 
   echo "RUN tar -cf /tmp/checksum.tar /bmk /cvmfs && checksum=\`md5sum /tmp/checksum.tar| cut -f1 -d\" \"\` && rm /tmp/checksum.tar && echo '{\"version\":\"$HEPWL_DOCKERIMAGETAG\",\"description\":\"$HEPWL_BMKDESCRIPTION\",\"checksum\":\"'\$checksum'\"}' > /bmk/$HEPWL_BMKDIR/version" >> $dockerFile
 
-  echo "[generate_Dockerfile] Successfully generated: $dockerFile"
+  echo "[${FUNCNAME[0]}] Successfully generated: $dockerFile"
 
 }