major update of make* scripts, start using underscore prefix for loca…

…l functions, more commonality in options

barcodeinterpret

@@ -5,12 +5,12 @@ scriptdir=$(dirname "$0")
 . "$scriptdir/mmfunctions" || { echo "Missing '$scriptdir/mmfunctions'. Exiting." ; exit 1 ;};
 
 cleanup(){
-    log -a "Process aborted"
+    _log -a "Process aborted"
     exit 1
 }
 
 trap cleanup SIGHUP SIGINT SIGTERM
-log -b
+_log -b
 
 if test $# != 1 ; then
     echo "You must supply one argument, a scanned interleaved 2/5 barcode value"; exit
@@ -65,4 +65,4 @@ if [[ $(echo "$materialid" | tail -c +9 | head -c 1) == "H" ]] ; then
    materialid="${materialid}D"
 fi
 echo deviceid,$(echo $ids | cut -d ' ' -f 1),materialid,$materialid,som,$(addcolons $(echo $barcode | cut -c 42-49)),duration,$(addcolons $(echo $barcode | cut -c 50-57))
-log -e
+_log -e

blackatends

@@ -6,7 +6,7 @@ scriptdir=$(dirname "$0")
 version=1.0
 
 cleanup(){
-    log -a "Process aborted"
+    _log -a "Process aborted"
     exit 1
 }
 
@@ -38,9 +38,9 @@ done
 shift $(( ${OPTIND} - 1 ))
 
 while [ "$*" != "" ] ; do
-    log -b
+    _log -b
     [ "$#" != 0 ] && sourcefile="$1"
     black_at_ends "$sourcefile"
-    log -e
+    _log -e
     shift
 done

checksumpackage

@@ -22,7 +22,7 @@ usage(){
 check_dependencies "${dependencies[@]}"
 
 cleanup(){
-    log -a "Process aborted"
+    _log -a "Process aborted"
     exit 1
 }
 
@@ -33,7 +33,7 @@ CHECKSUMNAME="checksum.md5"
 DFXMLNAME="dfxml.xml"
 
 while [ "${*}" != "" ] ; do
-    log -b
+    _log -b
     if [ -d "${1}" ] ; then
         PWD=$(pwd)
         "${scriptdir}/removeDSStore" "$1"
@@ -59,6 +59,6 @@ while [ "${*}" != "" ] ; do
     else
     report -dt "ERROR: ${0} requires directories as input and $1 is not a directory."
     fi
-    log -e
+    _log -e
     shift
 done

fix_left2stereo

@@ -9,7 +9,7 @@ scriptdir=$(dirname "$0")
 
 usage(){
     echo
-    echo "$(basename $0) ${version}"
+    echo "$(basename ${0}) ${version}"
     echo "This application takes an input video file(s) and produces outputs that are map the left channel of the input to a stereo mix in the output."
     echo "Dependencies: ${dependencies[@]}"
     echo "Usage: $(basename $0) file1 [ file2 ...]"
@@ -20,15 +20,15 @@ usage(){
 check_dependencies "${dependencies[@]}"
 
 cleanup(){
-    log -a "Process aborted"
+    _log -a "Process aborted"
     exit 1
 }
 
 # local variables
 suffix="_left2stereo"
 
 trap cleanup SIGHUP SIGINT SIGTERM
-log -b
+_log -b
 
 while [ "$*" != "" ] ; do
 
@@ -52,4 +52,4 @@ while [ "$*" != "" ] ; do
     fi
     shift
 done
-log -e
+_log -e

fix_rewrap

@@ -9,7 +9,7 @@ scriptdir=$(dirname "$0")
 
 usage(){
     echo
-    echo "$(basename $0) ${version}"
+    echo "$(basename ${0}) ${version}"
     echo "This application takes an input video file(s) and produces outputs through re-multiplexing all tracks of the input into a new container."
     echo "Dependencies: ${dependencies[@]}"
     echo "Usage: $(basename $0) file1 [ file2 ...]"
@@ -20,15 +20,15 @@ usage(){
 check_dependencies "${dependencies[@]}"
 
 cleanup(){
-    log -a "Process aborted"
+    _log -a "Process aborted"
     exit 1
 }
 
 # local variables
 suffix="_rewrap"
 
 trap cleanup SIGHUP SIGINT SIGTERM
-log -b
+_log -b
 
 while [ "$*" != "" ] ; do
 
@@ -51,4 +51,4 @@ while [ "$*" != "" ] ; do
     fi
     shift
 done
-log -e
+_log -e

fix_volume

@@ -34,12 +34,12 @@ done
 shift $(( ${OPTIND} - 1 ))
 
 cleanup(){
-    log -a "Process aborted"
+    _log -a "Process aborted"
     exit 1
 }
 
 trap cleanup SIGHUP SIGINT SIGTERM
-log -b
+_log -b
 
 while [ "$*" != "" ] ; do
     input_movie="${1}"
@@ -69,4 +69,4 @@ while [ "$*" != "" ] ; do
     fi
     shift
 done
-log -e
+_log -e

ingestfile

@@ -29,7 +29,7 @@ remove_mediaid_from_queue(){
 }
 
 cleanup(){
-    log -a "Process aborted"
+    _log -a "Process aborted"
     remove_mediaid_from_queue
     [ -d "${OUTDIR_INGESTFILE}/${mediaid}" ] && mv "${OUTDIR_INGESTFILE}/${mediaid}" "${OUTDIR_INGESTFILE}/${mediaid}_aborted_ingest_$(get_iso8601_c)"
     exit 1
@@ -171,23 +171,20 @@ if [ "${priority}" = "put in queue" ] ; then
     done
 fi
 
-log -b
+_log -b
 
 # set up package directories
-mkdir -p "${objectsdir}"
+_run_critical mkdir -p "${objectsdir}"
 logdir="${OUTDIR_INGESTFILE}/${mediaid}/metadata/submissionDocumentation/logs"
-mkdir -p "${logdir}"
+_run mkdir -p "${logdir}"
 submissiondocdir="${OUTDIR_INGESTFILE}/${mediaid}/metadata/submissionDocumentation"
-mkdir -p "${submissiondocdir}"
+_run mkdir -p "${submissiondocdir}"
 
 start=$(get_iso8601)
 
 # rsync
 report -dt "STATUS Copying the original file to library storage at ${objectsdir}."
-rsync -rt --progress --log-file="${logdir}/rsync_$(get_iso8601_c)_$(basename $0)_${version}.txt" "${input}" "${objectsdir}/"
-
-rsync_err="${?}"
-[ "${rsync_err}" -gt "0" ] && { report -wt "rsync failed with error ${rsync_err}" ; exit 1 ;};
+_run_critical rsync -rt --progress --log-file="${logdir}/rsync_$(get_iso8601_c)_$(basename $0)_${version}.txt" "${input}" "${objectsdir}/"
 
 # make copy for broadcast
 unset makebroadcastopts
@@ -243,11 +240,11 @@ if [ "${cleanup}" == "Y" ] ; then
         report -wt "Cancelling requested deletion of source file, not looking safe."
     else
         report -dt "Removing the source file from ${input} as requested."
-        rm -f "${input}"
+        _run rm -f "${input}"
     fi
 fi
 
 # clean up queue
 [ "${priority}" == "put in queue" ] && remove_mediaid_from_queue
 
-log -e
+_log -e