remove trailing space

Author: dericed

README.md

@@ -7,13 +7,13 @@ SCRIPTDIR=$(dirname "${0}")
 
 # check environment
 if [ -z "${FILEMAKER_DB}" ] ; then
-    echo "The filemaker database must be set. Run mmconfig to set FILEMAKER_DB."  
-    _writeerrorlog "checksum2filemaker" "The filemaker database was not set, so the script was unable to run." 
-    exit 1 
+    echo "The filemaker database must be set. Run mmconfig to set FILEMAKER_DB."
+    _writeerrorlog "checksum2filemaker" "The filemaker database was not set, so the script was unable to run."
+    exit 1
 fi
-if [ -z "${FILEMAKER_XML_URL}" ] ; then  
-    echo "The filemaker xml path must be set. Run mmconfig to set FILEMAKER_XML_URL."  
-    _writeerrorlog "checksum2filemaker" "The filemaker xml path was not set, so the script was unable to run."  
+if [ -z "${FILEMAKER_XML_URL}" ] ; then
+    echo "The filemaker xml path must be set. Run mmconfig to set FILEMAKER_XML_URL."
+    _writeerrorlog "checksum2filemaker" "The filemaker xml path was not set, so the script was unable to run."
     exit 1
 fi
 

checksum2filemaker

@@ -56,7 +56,7 @@ while [ "${*}" != "" ] ; do
     MIDDLEOPTIONS+=(-c:a pcm_s24be)
     MIDDLEOPTIONS+=(-ar 48000)
     MIDDLEOPTIONS+=(-ac 2)
-    
+
     if [ "${CODEC_TAG_STRING}" = "mpeg" ] ; then
         EXTENSION="mxf"
     else

fix_volume

@@ -201,15 +201,15 @@ _ask_mediaid
 
 ## check for existing output
 if [ -d "${OUTDIR_INGESTFILE}/${MEDIAID}" ] ; then
-     _report -wt "It looks like ${MEDIAID} was already ingested. If you want to overwrite the existing one please delete ${OUTDIR_INGESTFILE}/${MEDIAID} first and then try again." 
-     exit 1 
+     _report -wt "It looks like ${MEDIAID} was already ingested. If you want to overwrite the existing one please delete ${OUTDIR_INGESTFILE}/${MEDIAID} first and then try again."
+     exit 1
 fi
-if [ -d "${AIP_STORAGE}/${MEDIAID}" ] ; then 
-    _report -wt "It looks like ${MEDIAID} was already ingested. If you want to overwrite the existing one please delete ${AIP_STORAGE}/${MEDIAID} first and then try again." 
+if [ -d "${AIP_STORAGE}/${MEDIAID}" ] ; then
+    _report -wt "It looks like ${MEDIAID} was already ingested. If you want to overwrite the existing one please delete ${AIP_STORAGE}/${MEDIAID} first and then try again."
     exit 1
 fi
 _ask_input
-#here is where we would insert an option for searching for  directory. 
+#here is where we would insert an option for searching for  directory.
 if [ ! $(_is_video "${INPUT}") ] ; then
     _report -qnt "WARNING: ${INPUT} is not recognized as a video file. Please press q to quit, any other key to continue (if you know what you're doing): "
     read NOTVIDRESPONSE
@@ -382,7 +382,7 @@ fi
 
 
 # if the input is uncompressed, this will try and compress the file
-if [ "${PRESERVATION_MODE}" = "Y" ] ; then   
+if [ "${PRESERVATION_MODE}" = "Y" ] ; then
     makelossless "${OUTDIR_INGESTFILE}/${MEDIAID}"
 fi
 
@@ -436,7 +436,7 @@ if [ "${DOCHECKSUMS}" = "Y" ] ; then
     "${SCRIPTDIR}/checksumpackage" "${OUTDIR_INGESTFILE}/${MEDIAID}"
 fi
 
-#make xml file of directory structure 
+#make xml file of directory structure
 if [ "${MAKETREE}" = "Y" ] ; then
     "${SCRIPTDIR}/maketree" "${OUTDIR_INGESTFILE}/${MEDIAID}"
 fi
@@ -451,7 +451,7 @@ if [ "${DELIVERYTOAIPSTORAGE}" == "Y" ] ; then
     [ $(du -s "${OUTDIR_INGESTFILE}/${MEDIAID}" | awk '{print $1}') = "0" ] && rm -r "${OUTDIR_INGESTFILE}/${MEDIAID}"
     _report -dt "STATUS Done. Final package has been delivered to ${AIP_STORAGE}/${MEDIAID}"
 fi
-    
+
 if [ "${CLEANUP_CHOICE}" == "Y" ] ; then
     if [ "${RSYNC_ERR}" -gt "0" ] ; then
         _report -wt "Cancelling requested deletion of source file, not looking safe."

ingestfile

@@ -84,7 +84,7 @@ while [ "${*}" != "" ] ; do
     INTIME=""
     OUTTIME=""
     audio_adjustment=""
-    
+
     _unset_variables
     _get_broadcastduration "${SOURCEFILE}"
     _get_videostreamcount "${SOURCEFILE}"
@@ -124,7 +124,7 @@ while [ "${*}" != "" ] ; do
             echo "${SERIESTITLE}" > /tmp/slate_series.txt
             echo "${EPISODETITLE}" > /tmp/slate_episode.txt
             echo "${BROADCASTDURATION}" > /tmp/slate_duration.txt
-            
+
             COLORBARS_SECS=60
             SLATE_SECS=20
             COUNTDOWN_SECS=8.2
@@ -174,7 +174,6 @@ while [ "${*}" != "" ] ; do
             MIDDLEOPTIONS+=(-ps 1)
             MIDDLEOPTIONS+=(-flags +ildct+ilme)
             MIDDLEOPTIONS+=(-pix_fmt yuv422p)
-        
 
             #xdcam options
             MIDDLEOPTIONSXDCAM+=(-s 1920x1080)
@@ -328,7 +327,7 @@ scale=size=hd1080,format=yuv422p,setsar=1/1,setdar=16/9,fps=fps=ntsc[slate_v1];[
 [slate_v1][slate_stereo1][slate_mono1][slate_mono2][program_video][stereo1][mono1][mono2]concat=n=2:v=1:a=3[with_slate_video][with_slate_stereo1][with_slate_mono1][with_slate_mono2]"
 MIDDLEOPTIONS+=(-map "[with_slate_video]" -map "[with_slate_stereo1]" -map "[with_slate_mono1]" -map "[with_slate_mono2]")
     fi
-    
+
     _filter_to_middle_option
 #    MIDDLEOPTIONS+=(-metadata comment="INPUTOPTIONS: ${INPUTOPTIONS[@]}
 #FFMPEGINPUT: ${FFMPEGINPUT}

makebroadcast

@@ -81,7 +81,7 @@ while [ "${*}" != "" ] ; do
 
     # clear local arrays
     _unset_variables
-    
+
     _get_videostreamcount "${SOURCEFILE}"
     _get_audiostreamcount "${SOURCEFILE}"
 
@@ -120,13 +120,13 @@ while [ "${*}" != "" ] ; do
         MIDDLEOPTIONS+=(-lmax 200000)
         MIDDLEOPTIONS+=(-aspect "${ASPECT}")
         if  [[ "${WIDTH}" == 720 && "${HEIGHT}" == 486 ]] ; then
-            _add_video_filter "fieldorder=bff" 
+            _add_video_filter "fieldorder=bff"
             _add_video_filter "crop=720:480:0:4"
             _add_video_filter "setdar=${ASPECT}${TIMECODEOVERLAY}"
         elif  [[ "${WIDTH}" == 720 && "${HEIGHT}" == 480 ]] ; then
             _add_video_filter "fieldorder=bff"
             _add_video_filter "setdar=${ASPECT}${TIMECODEOVERLAY}"
-        elif  [[ "${WIDTH}" == 720 && "${HEIGHT}" == 512 ]] ; then 
+        elif  [[ "${WIDTH}" == 720 && "${HEIGHT}" == 512 ]] ; then
             _add_video_filter "fieldorder=bff"
             _add_video_filter "crop=720:480:0:32"
             _add_video_filter "setdar=${ASPECT}${TIMECODEOVERLAY}"
@@ -136,8 +136,8 @@ while [ "${*}" != "" ] ; do
             _add_video_filter "setdar=${ASPECT}${TIMECODEOVERLAY}"
         fi
     else
-        _report -wt "You can't make a dvd from this file. Exiting." 
-        _writeerrorlog "makedvd" "The script was unable to create dvd from this file." 
+        _report -wt "You can't make a dvd from this file. Exiting."
+        _writeerrorlog "makedvd" "The script was unable to create dvd from this file."
         exit 1
     fi
     if [[ "${AUDIOSTREAMCOUNT}" > 0 ]] ; then
@@ -153,9 +153,9 @@ while [ "${*}" != "" ] ; do
     else
         FFMPEGINPUT="${SOURCEFILE}"
     fi
-    
+
     _filter_to_middle_option
-    
+
     _run_critical ffmpeg ${INPUTOPTIONS[@]} -i "${FFMPEGINPUT}" ${MIDDLEOPTIONS[@]} "${OUTPUTDIR}/${MEDIAID%.*}.mpeg"
     # Making DVD VIDEO_TS folder, chapters every 5 minutes, dvdauthor will ignore chapter markers greater than duration
     export VIDEO_FORMAT=NTSC

makedvd

@@ -114,9 +114,9 @@ while [ "${*}" != "" ] ; do
     else
         FFMPEGINPUT="${SOURCEFILE}"
     fi
-    
+
     _filter_to_middle_option
-       
+
     _run_critical ffmpeg "${INPUTOPTIONS[@]}" -i "${FFMPEGINPUT}" "${MIDDLEOPTIONS[@]}" "${OUTPUT}"
     echo
     _summarize_make

makeflv

@@ -60,8 +60,8 @@ while [ "${*}" != "" ] ; do
     fi
     _add_video_filter "yadif"
     _add_video_filter "thumbnail=100"
-    MIDDLEOPTIONS+=(-frames:v 1) 
-    
+    MIDDLEOPTIONS+=(-frames:v 1)
+
     _filter_to_middle_option
 
     _log -b
@@ -78,7 +78,7 @@ while [ "${*}" != "" ] ; do
         else
             FFMPEGINPUT="${SOURCEFILE}"
         fi
-        
+
         _run_critical ffmpeg -y ${INPUTOPTIONS[@]} -v warning -ss "$START" -i "${FFMPEGINPUT}" "${MIDDLEOPTIONS[@]}" "${OUTPUT}"
     done
     echo

makeframes

@@ -81,9 +81,9 @@ while [ "${*}" != "" ] ; do
         if [ "${CODEC_TAG_STRING}" == "2vuy" -o "${CODEC_TAG_STRING}" == "v210" ] ; then
             _report -dt "${SOURCEFILENAME} is ${CODEC_TAG_STRING}, starting encode"
             _prep_ffmpeg_log
-           
+
             _filter_to_middle_option
-           
+
             _run_critical ffmpeg ${INPUTOPTIONS[@]} -i "${SOURCEFILE}"  ${MIDDLEOPTIONS[@]} "${OUTPUTDIR}/${SOURCEFILENAME%.*}${SUFFIX}.mov" -f framemd5 -an "${LOGDIR}/${SOURCEFILENAME%.*}.framemd5"
             if [ "${CODEC_TAG_STRING}" == "2vuy" ] ; then
                 _run_critical ffmpeg ${INPUTOPTIONS[@]} -i "${OUTPUTDIR}/${SOURCEFILENAME%.*}${SUFFIX}.mov" -f framemd5 -pix_fmt uyvy422 -an "${LOGDIR}/${SOURCEFILENAME%.*}${SUFFIX}.framemd5"

makelossless

@@ -67,9 +67,9 @@ while [ "${*}" != "" ] ; do
     _log -b
 
     _set_up_output
-    
+
     _unset_variables
-    
+
     INPUTOPTIONS+=(-nostdin)
     MIDDLEOPTIONS+=(-map 0:a:0)
     MIDDLEOPTIONS+=(-ac 2)

makemp3

@@ -93,9 +93,9 @@ while [ "${*}" != "" ] ; do
     else
         FFMPEGINPUT="${SOURCEFILE}"
     fi
-    
+
     _filter_to_middle_option
-    
+
     _run_critical ffmpeg "${INPUTOPTIONS[@]}" -i "${FFMPEGINPUT}" "${MIDDLEOPTIONS[@]}" "${OUTPUT}"
     echo
     _summarize_make

makepodcast

@@ -39,7 +39,7 @@ while [ "${*}" != "" ] ; do
         -show_versions \
         -of xml=x=1:q=1 \
         -noprivate | gzip > "${file}.qctools.xml.gz"
-    
+
         echo
         echo "movie=${file}${moviefiltermap}${moviefilteroutput},\
         [v0]signalstats=stat=tout+vrep+brng,\
@@ -48,7 +48,7 @@ while [ "${*}" != "" ] ; do
         [b]field=bottom[b1],[a1][b1]psnr[out0]\
         ${ebur128filters}"
         echo
-    
+
     else
         echo "Error: $(basename '"${file}"' does not appear to have a video track, skipping.)"
     fi

makeqctoolsreport

@@ -12,7 +12,7 @@ RELATIVEPATH="access/resourcespace"
 _usage(){
     echo
     echo "$(basename "${0}") ${VERSION}"
-    echo "This application will create a high quality h264 file (suitable for uploading to YouTube) from a video file or package input with the following options." 
+    echo "This application will create a high quality h264 file (suitable for uploading to YouTube) from a video file or package input with the following options."
     echo "DEPENDENCIES: ${DEPENDENCIES[@]}"
     echo "Usage: $(basename "${0}") [ -d /path/to/deliver/to/ ] fileorpackage1 [ fileorpackage2 ...]"
     echo "  -l (only use the left channel of the first audio track)"
@@ -122,9 +122,9 @@ while [ "${*}" != "" ] ; do
     else
         FFMPEGINPUT="${SOURCEFILE}"
     fi
-    
+
     _filter_to_middle_option
-       
+
     _run_critical ffmpeg "${INPUTOPTIONS[@]}" -i "${FFMPEGINPUT}" "${MIDDLEOPTIONS[@]}" "${OUTPUT}"
     echo
     _summarize_make

makeresourcespace

@@ -7,7 +7,7 @@ while [ "${*}" != "" ] ; do
     # get context about the input
     PACKAGE="${1}"
     shift
-    if [ -d "${PACKAGE}" ] ; then 
+    if [ -d "${PACKAGE}" ] ; then
         OUTPUTDIR="${PACKAGE}/metadata"
         if [ -s "${OUTPUTDIR}/tree.xml" ] ; then
             _report -dt "directory tree already exists, skipping for ${PACKAGE}"

maketree

@@ -119,15 +119,15 @@ while [ "${*}" != "" ] ; do
     MIDDLEOPTIONS+=(-f mp4)
 
     _prep_ffmpeg_log
-    
+
     if [ "${CONCATSOURCE}" != "" ] ; then
         FFMPEGINPUT="${CONCATSOURCE}"
     else
         FFMPEGINPUT="${SOURCEFILE}"
     fi
-    
+
     _filter_to_middle_option
-    
+
     _run_critical ffmpeg "${INPUTOPTIONS[@]}" -i "${FFMPEGINPUT}" "${MIDDLEOPTIONS[@]}" "${OUTPUT}"
     echo
     _summarize_make

makeyoutube

@@ -240,8 +240,8 @@ if [[ "${RUNPASHUA}" == "Y" ]] ; then
     echo "  FILEMAKER_XML_URL = ${FILEMAKER_XML_URL}"
     echo "  VOLADJUST = ${VOLADJUST}"
     echo ""
-    
-    #write to the config file 
+
+    #write to the config file
     echo "OUTDIR_INGESTFILE=\"${OUTDIR_INGESTFILE}\"" > "${CONFIG_FILE}"
     echo "OUTDIR_INGESTXDCAM=\"${OUTDIR_INGESTXDCAM}\"" >> "${CONFIG_FILE}"
     echo "OUTDIR_PAPER=\"${OUTDIR_PAPER}\"" >> "${CONFIG_FILE}"
@@ -262,8 +262,8 @@ if [[ "${RUNPASHUA}" == "Y" ]] ; then
     echo "FILEMAKER_DB=\"${FILEMAKER_DB}\"" >> "${CONFIG_FILE}"
     echo "FILEMAKER_XML_URL=\"${FILEMAKER_XML_URL}\"" >> "${CONFIG_FILE}"
     echo "VOLADJUST=\"${VOLADJUST}\"" >> "${CONFIG_FILE}"
-else  
-    # set up configuration file using the command line 
+else
+    # set up configuration file using the command line
     echo "# $(basename ${CONFIG_FILE})" > "${CONFIG_FILE}"
     echo "# This configuration file contains variables used throughout ${WHAT_IS_THIS}." >> "${CONFIG_FILE}"
     echo "# Edit the lines below to form KEY=VALUE. Please do not add or remove the existing KEYs. Do not edit CONFIG_FILE_VERSION." >> "${CONFIG_FILE}"

mmconfig

@@ -212,7 +212,7 @@ _reset_directory(){
         _report -dt "I'm going to place the AIP in the same directory as the original input file."
     fi
 }
-    
+
 _ask_intime(){
     # TIME_REGEX tests for either S.mmm or HH:MM:SS.mmm time formats where HH is two digit hour, MM is two digit minute, S is number of seconds, SS is two digit seconds, and .mmm is milliseconds from between 0 and 3 decimals
     TIME_REGEX="^\([0-9]\+\(\.[0-9]\{1,3\}\)\?\|[0-9]\{2\}:[0-5][0-9]:[0-5][0-9]\(\.[0-9]\{1,3\}\)\?\)$"
@@ -324,7 +324,7 @@ _get_seconds(){
 _email_delivery(){
     EMAILTO="${1}"
     if [ "${EMAILTO}" ] ; then
-        _get_prettyduration "${OUTPUT}" 
+        _get_prettyduration "${OUTPUT}"
         if [[ -f "${INGESTLOG}" ]] ; then
             FROMLOG="Operator: $(_readingestlog "operator")\n
 Processing Computer: $(_readingestlog "computer_name")
@@ -424,11 +424,11 @@ _find_input (){
     [ -d "${1}" ] && [ -d "${1}/objects/service" ] && ISOBJECT="N" && SOURCEFILE=$(find "${1}/objects/service" -maxdepth 1 -mindepth 1 -type f \( -iname "*.mov" -o -iname "*.mxf" -o -iname "*.mp4" -o -iname "*.dv" -o -iname "*.mpeg" -o -iname "*.iso" -o -iname "*.mkv" -o -iname "*.m2ts" \) ! -name ".*" | head -n 1)
     [ -f "${1}" ] && SOURCEFILE="${1}"
     [ ! "${SOURCEFILE}" ] && [ -d "${1}/objects" ] && ISOBJECT="Y" && SOURCEFILE=$(find "${1}/objects" -maxdepth 1 -mindepth 1 -type f \( -iname "*.mov" -o -iname "*.mxf" -o -iname "*.mp4" -o -iname "*.dv" -o -iname "*.mpeg" -o -iname "*.iso" -o -iname "*.mkv" -o -iname "*.m2ts" \) ! -name ".*" | head -n 1)
-    if [ ! "${SOURCEFILE}" ] ; then 
+    if [ ! "${SOURCEFILE}" ] ; then
         _report -wt "A valid source file isn't found."
-        _writeerrorlog "_find_input" "A valid source file was not found, so the script could not proceed." 
+        _writeerrorlog "_find_input" "A valid source file was not found, so the script could not proceed."
         exit 1
-    fi 
+    fi
     LOG+="SOURCEFILE: ${SOURCEFILE}\n"
     if [ "${SOURCEFILE#*.}" == "iso" ] ; then
         _report -dt "Detecting iso input and hoping its a dvd image"
@@ -711,7 +711,7 @@ _free_space(){
     local SPACE="${1}"  #This value represents the space in gigabytes required for the script to run
     local OUTPUTDIR="${2}"
     if [ ! -d "${OUTPUTDIR}" ] ; then
-        _report -wt "The output directory [${OUTPUTDIR}] that free-space function is seeking does not exist." 
+        _report -wt "The output directory [${OUTPUTDIR}] that free-space function is seeking does not exist."
         exit 1
     fi
     [[ ! "${SPACE}" =~ ^-?[0-9]+$ ]] && { _report -wt "Number is not an integer." ; exit 1 ;};
@@ -824,9 +824,9 @@ _prep_volume_adjustment(){
 _filter_to_middle_option(){
     if [ -n  "${VIDEOFILTERCHAIN}" -a -n "${AUDIOFILTERCHAIN}" ] ; then
         MIDDLEOPTIONS+=(-filter_complex ${VIDEOFILTERCHAIN}\;${AUDIOFILTERCHAIN})
-    elif [ -n  "${VIDEOFILTERCHAIN}" ] ; then 
+    elif [ -n  "${VIDEOFILTERCHAIN}" ] ; then
         MIDDLEOPTIONS+=(-filter_complex ${VIDEOFILTERCHAIN})
-    elif [ -n  "${AUDIOFILTERCHAIN}" ] ; then 
+    elif [ -n  "${AUDIOFILTERCHAIN}" ] ; then
         MIDDLEOPTIONS+=(-filter_complex ${AUDIOFILTERCHAIN})
     fi
 }
@@ -879,15 +879,15 @@ _pashua_run() {
         fi
     else
         ENCODING=""
-        
+
         # Get result
         RESULT=`"${PASHUAPATH}" ${ENCODING} ${PASHUA_CONFIGFILE} | sed 's/ /;;;/g'`
 
         # Parse result
         for LINE in ${RESULT}
         do
             KEY=`echo ${LINE} | sed 's/^\([^=]*\)=.*$/\1/'`
-            VALUE=`echo ${LINE} | sed 's/^[^=]*=\(.*\)$/\1/' | sed 's/;;;/ /g'`        
+            VALUE=`echo ${LINE} | sed 's/^[^=]*=\(.*\)$/\1/' | sed 's/;;;/ /g'`
             VARNAME="${KEY}"
             VARVALUE="${VALUE}"
             eval $VARNAME='$VARVALUE'