From d5e38a1ecf67ae4692632772fd62516efb5e811d Mon Sep 17 00:00:00 2001
From: Database <database@ingest4.local>
Date: Mon, 8 Apr 2013 15:36:03 -0400
Subject: [PATCH] Added blank line at end of scripts

---
 barcodeinterpret | 2 +-
 blackatends      | 2 +-
 checksumpackage  | 2 +-
 fix_left2stereo  | 2 +-
 fix_rewrap       | 2 +-
 fix_volume       | 2 +-
 ingestfile       | 2 +-
 install          | 2 +-
 makebroadcast    | 2 +-
 makedvd          | 2 +-
 makelossless     | 2 +-
 makemetadata     | 2 +-
 makepodcast      | 2 +-
 makeyoutube      | 2 +-
 mmfunctions      | 3 ++-
 paperingest      | 2 +-
 quickcompare     | 4 ++--
 removeDSStore    | 2 +-
 uploadomneon     | 2 +-
 xdcamingest      | 2 +-
 20 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/barcodeinterpret b/barcodeinterpret
index 3a008ce3..95a773e1 100755
--- a/barcodeinterpret
+++ b/barcodeinterpret
@@ -68,4 +68,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
\ No newline at end of file
+log -e
diff --git a/blackatends b/blackatends
index 96996c61..92a4bea8 100755
--- a/blackatends
+++ b/blackatends
@@ -22,4 +22,4 @@ while [ "$*" != ""  -o "$once" = "y" ] ; do
 	black_at_ends "$sourcefile"
 	shift
 done
-log -e
\ No newline at end of file
+log -e
diff --git a/checksumpackage b/checksumpackage
index 5d32f5ed..4d50b48c 100755
--- a/checksumpackage
+++ b/checksumpackage
@@ -48,4 +48,4 @@ while [ "$*" != "" ] ; do
 	fi
 	shift
 done
-log -e
\ No newline at end of file
+log -e
diff --git a/fix_left2stereo b/fix_left2stereo
index ec8947f8..1846e10b 100755
--- a/fix_left2stereo
+++ b/fix_left2stereo
@@ -40,4 +40,4 @@ while [ "$*" != "" ] ; do
 	fi
 	shift
 done
-log -e
\ No newline at end of file
+log -e
diff --git a/fix_rewrap b/fix_rewrap
index 0139dd52..4853082f 100755
--- a/fix_rewrap
+++ b/fix_rewrap
@@ -38,4 +38,4 @@ while [ "$*" != "" ] ; do
 	fi
 	shift
 done
-log -e
\ No newline at end of file
+log -e
diff --git a/fix_volume b/fix_volume
index 45eaf9ba..4944e11d 100755
--- a/fix_volume
+++ b/fix_volume
@@ -42,4 +42,4 @@ while [ "$*" != "" ] ; do
 	fi
 	shift
 done
-log -e
\ No newline at end of file
+log -e
diff --git a/ingestfile b/ingestfile
index 864937b3..df2f8f33 100755
--- a/ingestfile
+++ b/ingestfile
@@ -221,4 +221,4 @@ if [ "$priority" == "put in queue" ] ; then
 	mv /tmp/queue2.txt /tmp/queue.txt
 fi
 done
-log -e
\ No newline at end of file
+log -e
diff --git a/install b/install
index 4d4a561e..e9e1677f 100755
--- a/install
+++ b/install
@@ -15,4 +15,4 @@ pwd = File.expand_path File.join(__FILE__, "..")
 
 %w[barcodeinterpret blackatends checksumpackage fix_left2stereo fix_rewrap fix_volume mmfunctions mmhelp ingestfile makebroadcast makedvd makemetadata makepodcast makeyoutube quickcompare removeDSStore xdcamingest].each do |file|
   system command+'"'+pwd+'/'+file+'"'+" /usr/local/bin"
-end
\ No newline at end of file
+end
diff --git a/makebroadcast b/makebroadcast
index 9edf07b7..bdf62f33 100755
--- a/makebroadcast
+++ b/makebroadcast
@@ -97,4 +97,4 @@ while [ "$*" != ""  -o "$once" = "y" ] ; do
 	[ "$ffmpeg_err" -gt "0" ] && { report -wt "ffmpeg failed with error ${ffmpeg_err}" && exit 1;};
 	shift
 done
-log -e
\ No newline at end of file
+log -e
diff --git a/makedvd b/makedvd
index 8da4108f..45471104 100755
--- a/makedvd
+++ b/makedvd
@@ -114,4 +114,4 @@ while [ "$*" != ""  -o "$once" = "y" ] ; do
 	report -dt "STATUS ${mediaid%.*}.iso is generated."
 	shift
 done
-log -e
\ No newline at end of file
+log -e
diff --git a/makelossless b/makelossless
index aeffa96d..359ad950 100755
--- a/makelossless
+++ b/makelossless
@@ -74,4 +74,4 @@ while [ "$*" != "" ] ; do
 	echo done with "$sourcefile"
 	shift
 done
-log -e
\ No newline at end of file
+log -e
diff --git a/makemetadata b/makemetadata
index ea6214b6..51f3430b 100755
--- a/makemetadata
+++ b/makemetadata
@@ -86,4 +86,4 @@ while [ "$*" != "" ] ; do
 	shift
 	counter=`expr "$counter" + 1`
 done
-log -e
\ No newline at end of file
+log -e
diff --git a/makepodcast b/makepodcast
index 3d09ca94..3d7af1d1 100755
--- a/makepodcast
+++ b/makepodcast
@@ -65,4 +65,4 @@ while [ "$*" != ""  -o "$once" = "y" ] ; do
 	eval "$makepodcastcommand"
 	shift
 done
-log -e
\ No newline at end of file
+log -e
diff --git a/makeyoutube b/makeyoutube
index 1cc18f27..76e3447a 100755
--- a/makeyoutube
+++ b/makeyoutube
@@ -95,4 +95,4 @@ while [ "$*" != ""  -o "$once" = "y" ] ; do
 	fi
 	shift
 done
-log -e
\ No newline at end of file
+log -e
diff --git a/mmfunctions b/mmfunctions
index 0d78dd3c..61ce71b3 100755
--- a/mmfunctions
+++ b/mmfunctions
@@ -36,7 +36,7 @@ report(){
 			case "$opt" in
 				q) color="$BLUE" ;;                         # question mode, use color blue
 				d) color="$GREEN" ;;                        # declaration mode, use color green
-				w) color="$RED" ;;                          # warning mode, use color red
+				w) color="$RED" ; log="Y";;                 # warning mode, use color red
 				t) startmessage="$(get_iso8601) - " ;;      # prepend timestamp to the message
 				s) startmessage+="[$(basename $0)] " ;;     # prepend scriptname to the message
 				n) echoopt="-n" ;;                          # to avoid line breaks after echo
@@ -45,6 +45,7 @@ report(){
 		shift $(( ${OPTIND} - 1 ))
 		message="$1"
 		echo $echoopt "${color}${startmessage}${message}${NC}"
+		[ "$log" = "Y" ] && log -c "$message"
 }
 
 black_at_ends(){
diff --git a/paperingest b/paperingest
index cd235c9f..6e5d4d9c 100755
--- a/paperingest
+++ b/paperingest
@@ -16,7 +16,7 @@ ask_operator
 
 ask_mediaid
 
-if [ -d "$mediaid" ] ; then
+if [ -d "$outputdir_paper/$mediaid" ] ; then
 	report -wdt "It looks like this $mediaid was already scanned. If you want to overwrite the existing one please delete $mediaid first and then try again."
 exit
 fi
diff --git a/quickcompare b/quickcompare
index 1cd71d0d..914b5252 100755
--- a/quickcompare
+++ b/quickcompare
@@ -19,5 +19,5 @@ log -b
 #[ ! `du "$1" | cut -f1` = `du "$2" | cut -f1` ] && echo The files are different sizes
 [ ! `head -c "$checksize" "$1" | md5` = `head -c "$checksize" "$2" | md5` ] && echo The first "$checksize" bytes have different md5s.
 [ ! `tail -c "$checksize" "$1" | md5` = `tail -c "$checksize" "$2" | md5` ] && echo The last "$checksize" bytes have different md5s.
-done
-log -e
\ No newline at end of file
+
+log -e
diff --git a/removeDSStore b/removeDSStore
index e20dd363..a34c9349 100755
--- a/removeDSStore
+++ b/removeDSStore
@@ -21,4 +21,4 @@ while [ "$*" != "" ] ; do
 	fi
 	shift
 done
-log -e
\ No newline at end of file
+log -e
diff --git a/uploadomneon b/uploadomneon
index 9699c59d..2647a137 100755
--- a/uploadomneon
+++ b/uploadomneon
@@ -84,4 +84,4 @@ report -wt "$filename is already on the omneon as a $size_g gigabyte file."
 fi
 shift
 done
-log -e
\ No newline at end of file
+log -e
diff --git a/xdcamingest b/xdcamingest
index 24ae00b2..cd8ffef1 100755
--- a/xdcamingest
+++ b/xdcamingest
@@ -213,4 +213,4 @@ while true ; do
 		fi
 	fi
 done
-log -e
\ No newline at end of file
+log -e