Fixed log messages to include correct information. (#65)

Author: david-waltermire

scripts/generate-content-converter.sh

@@ -80,6 +80,11 @@ OTHER_ARGS=$@ # save the remaining args
 METASCHEMA="$1"
 GENERATED_CONVERTER="$2"
 
+if [ "$VERBOSE" == "true" ] && [ "$PPID" == "$$" ]; then
+  echo -e "${P_INFO}Using working directory:${P_END} ${WORKING_DIR}"
+  echo -e "${P_INFO}Using cache directory:${P_END} ${CACHE_DIR}"
+fi
+
 if [ -z "$METASCHEMA" ]; then
   >&2 echo -e "${P_ERROR}You must specify the Metaschema to generate the converter for.${P_END}"
   usage
@@ -91,11 +96,6 @@ if [ ! -f "$METASCHEMA" ]; then
   exit 2
 fi
 
-if [ "$VERBOSE" == "true" ] && [ "$PPID" == "$$" ]; then
-  echo -e "${P_INFO}Using working directory:${P_END} ${WORKING_DIR}"
-  echo -e "${P_INFO}Using cache directory:${P_END} ${CACHE_DIR}"
-fi
-
 # make sure working directory exists
 mkdir -p "$(dirname "$WORKING_DIR")"
 
@@ -105,7 +105,7 @@ if ! [[ "$GENERATE_SOURCE_FORMAT" =~ ^(xml|json)$ ]]; then
 fi
 
 if ! [[ "$GENERATE_TARGET_FORMAT" =~ ^(xml|json)$ ]]; then
-  >&2 echo -e "${P_ERROR}Invalid source format '${P_END}${GENERATE_TARGET_FORMAT}${P_ERROR}'.${P_END} Supported formats are: xml or json"
+  >&2 echo -e "${P_ERROR}Invalid target format '${P_END}${GENERATE_TARGET_FORMAT}${P_ERROR}'.${P_END} Supported formats are: xml or json"
   exit 4
 fi
 

scripts/include/init-schematron.sh

@@ -5,7 +5,7 @@ init_schematron() {
   source "${my_dir}/init-saxon.sh"
 
   if [[ -z "$SCHEMATRON_HOME" ]]; then
-    echo -e "${P_INFO}SCHEMATRON_HOME is not set or is empty.${P_END} ${P_INFO}Please set SCHEMATRON_HOME to indicate the location of the schematron skeleton. The schematron skeleton can be cloned using git clone https://github.com/Schematron/schematron <schematron_home_dir>.${P_END}"
+#    echo -e "${P_INFO}SCHEMATRON_HOME is not set or is empty.${P_END} ${P_INFO}Please set SCHEMATRON_HOME to indicate the location of the schematron skeleton. The schematron skeleton can be cloned using git clone https://github.com/Schematron/schematron <schematron_home_dir>.${P_END}"
     SCHEMATRON_HOME="${my_dir}/../../support/schematron"
   fi
 
@@ -26,9 +26,10 @@ build_schematron() {
   xsl_transform "$SCHEMATRON_DIR/iso_svrl_for_xslt2.xsl" "-" "$compiled_schematron" "generate-paths=true diagnose=true allow-foreign=true"
   cmd_exitcode=$?
   if [ $cmd_exitcode -ne 0 ]; then
-      echo -e "${P_ERROR}Generating compiled Schematron failed for '$schematron'${P_END}"
+      echo -e "${P_ERROR}Generating compiled Schematron failed for '${P_END}$schematron${P_ERROR}'.${P_END}"
       return 1
   fi
+  echo -e "${P_INFO}Generated compiled Schematron '${P_END}$schematron${P_INFO}' as '${P_END}$compiled_schematron${P_INFO}'.${P_END}"
   return 0
 }