From af4278c14a0846c2188fe8e48ff0dcd0593a80a6 Mon Sep 17 00:00:00 2001
From: Dave Rice <dericed@gmail.com>
Date: Tue, 23 Apr 2013 22:46:22 -0400
Subject: [PATCH] call mmfunctions and have mmfunctions call mmvariables

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

diff --git a/barcodeinterpret b/barcodeinterpret
index 95a773e1..4ade7e8a 100755
--- a/barcodeinterpret
+++ b/barcodeinterpret
@@ -2,9 +2,7 @@
 # interpret Interleaved 2/5 barcode 58 byte barcode values used by the ProBell tape management system
 
 scriptdir=`dirname "$0"`
-. "$scriptdir/mmvariables"
-. "$scriptdir/mmfunctions"
-[ ! -f "$scriptdir/mmvariables" -o ! -f "$scriptdir/mmfunctions" ] && { echo "Missing '$scriptdir/mmvariables' and/or '$scriptdir/mmfunctions'. Exiting." ; exit 1 ;};
+. "$scriptdir/mmfunctions" || { echo "Missing '$scriptdir/mmfunctions'. Exiting." ; exit 1 ;};
 
 cleanup(){
 	log -a "Process aborted"
diff --git a/blackatends b/blackatends
index 92a4bea8..11d4a23e 100755
--- a/blackatends
+++ b/blackatends
@@ -2,9 +2,7 @@
 # blackatends
 # Accepts one or many video files as an input and determines how many frames of black are at the beginning and at the end
 scriptdir=`dirname "$0"`
-. "$scriptdir/mmvariables"
-. "$scriptdir/mmfunctions"
-[ ! -f "$scriptdir/mmvariables" -o ! -f "$scriptdir/mmfunctions" ] && { echo "Missing '$scriptdir/mmvariables' and/or '$scriptdir/mmfunctions'. Exiting." ; exit 1 ;};
+. "$scriptdir/mmfunctions" || { echo "Missing '$scriptdir/mmfunctions'. Exiting." ; exit 1 ;};
 
 cleanup(){
 	log -a "Process aborted"
diff --git a/checksumpackage b/checksumpackage
index 4d50b48c..5931f25a 100755
--- a/checksumpackage
+++ b/checksumpackage
@@ -5,9 +5,7 @@
 version=1.1
 
 scriptdir=`dirname "$0"`
-. "$scriptdir/mmvariables"
-. "$scriptdir/mmfunctions"
-[ ! -f "$scriptdir/mmvariables" -o ! -f "$scriptdir/mmfunctions" ] && { echo "Missing '$scriptdir/mmvariables' and/or '$scriptdir/mmfunctions'. Exiting." ; exit 1 ;};
+. "$scriptdir/mmfunctions" || { echo "Missing '$scriptdir/mmfunctions'. Exiting." ; exit 1 ;};
 
 cleanup(){
 	log -a "Process aborted"
diff --git a/fix_left2stereo b/fix_left2stereo
index 1846e10b..daa8f42f 100755
--- a/fix_left2stereo
+++ b/fix_left2stereo
@@ -2,9 +2,7 @@
 # left 2 stereo mix
 
 scriptdir=`dirname "$0"`
-. "$scriptdir/mmvariables"
-. "$scriptdir/mmfunctions"
-[ ! -f "$scriptdir/mmvariables" -o ! -f "$scriptdir/mmfunctions" ] && { echo "Missing '$scriptdir/mmvariables' and/or '$scriptdir/mmfunctions'. Exiting." ; exit 1 ;};
+. "$scriptdir/mmfunctions" || { echo "Missing '$scriptdir/mmfunctions'. Exiting." ; exit 1 ;};
 
 cleanup(){
 	log -a "Process aborted"
diff --git a/fix_rewrap b/fix_rewrap
index 4853082f..4d553936 100755
--- a/fix_rewrap
+++ b/fix_rewrap
@@ -2,9 +2,7 @@
 # this script takes one argument which is a video file. It then rewraps it to make a new file.
 
 scriptdir=`dirname "$0"`
-. "$scriptdir/mmvariables"
-. "$scriptdir/mmfunctions"
-[ ! -f "$scriptdir/mmvariables" -o ! -f "$scriptdir/mmfunctions" ] && { echo "Missing '$scriptdir/mmvariables' and/or '$scriptdir/mmfunctions'. Exiting." ; exit 1 ;};
+. "$scriptdir/mmfunctions" || { echo "Missing '$scriptdir/mmfunctions'. Exiting." ; exit 1 ;};
 
 cleanup(){
 	log -a "Process aborted"
diff --git a/fix_volume b/fix_volume
index aa48242e..8b81ed43 100755
--- a/fix_volume
+++ b/fix_volume
@@ -5,9 +5,7 @@
 suffix="_voladj"
 
 scriptdir=`dirname "$0"`
-. "$scriptdir/mmvariables"
-. "$scriptdir/mmfunctions"
-[ ! -f "$scriptdir/mmvariables" -o ! -f "$scriptdir/mmfunctions" ] && { echo "Missing '$scriptdir/mmvariables' and/or '$scriptdir/mmfunctions'. Exiting." ; exit 1 ;};
+. "$scriptdir/mmfunctions" || { echo "Missing '$scriptdir/mmfunctions'. Exiting." ; exit 1 ;};
 
 cleanup(){
 	log -a "Process aborted"
diff --git a/ingestfile b/ingestfile
index 5a487699..b2833ea6 100755
--- a/ingestfile
+++ b/ingestfile
@@ -10,9 +10,7 @@ deliveraccesscopies="Y"    # use 'Y' for yes or any other character for no
 deliverytoaipstorage="Y"   # use 'Y' for yes or any other character for no
 
 scriptdir=`dirname "$0"`
-. "$scriptdir/mmvariables"
-. "$scriptdir/mmfunctions"
-[ ! -f "$scriptdir/mmvariables" -o ! -f "$scriptdir/mmfunctions" ] && { echo "Missing '$scriptdir/mmvariables' and/or '$scriptdir/mmfunctions'. Exiting." ; exit 1 ;};
+. "$scriptdir/mmfunctions" || { echo "Missing '$scriptdir/mmfunctions'. Exiting." ; exit 1 ;};
 
 cleanup(){
 	log -a "Process aborted"
diff --git a/makebroadcast b/makebroadcast
index 05ee0ec6..0b2bd8da 100755
--- a/makebroadcast
+++ b/makebroadcast
@@ -3,10 +3,7 @@
 # make broadcast version
 
 scriptdir=`dirname "$0"`
-. "$scriptdir/mmvariables"
-. "$scriptdir/mmfunctions"
-[ ! -f "$scriptdir/mmvariables" -o ! -f "$scriptdir/mmfunctions" ] && { echo "Missing '$scriptdir/mmvariables' and/or '$scriptdir/mmfunctions'. Exiting." ; exit 1 ;};
-
+. "$scriptdir/mmfunctions" || { echo "Missing '$scriptdir/mmfunctions'. Exiting." ; exit 1 ;};
 
 # command-line options to set mediaid and original 
 OPTIND=1
diff --git a/makedvd b/makedvd
index a42f53b5..ab723127 100755
--- a/makedvd
+++ b/makedvd
@@ -4,9 +4,7 @@
 version="1.0"
 
 scriptdir=`dirname "$0"`
-. "$scriptdir/mmvariables"
-. "$scriptdir/mmfunctions"
-[ ! -f "$scriptdir/mmvariables" -o ! -f "$scriptdir/mmfunctions" ] && { echo "Missing '$scriptdir/mmvariables' and/or '$scriptdir/mmfunctions'. Exiting." ; exit 1 ;};
+. "$scriptdir/mmfunctions" || { echo "Missing '$scriptdir/mmfunctions'. Exiting." ; exit 1 ;};
 
 cleanup(){
 	log -a "Process aborted"
diff --git a/makeframes b/makeframes
index a854a783..aafab474 100755
--- a/makeframes
+++ b/makeframes
@@ -1,8 +1,7 @@
 #!/bin/bash 
 
 scriptdir=`dirname "$0"`
-. "$scriptdir/variables.sh"
-. "$scriptdir/functions.sh"
+. "$scriptdir/mmfunctions" || { echo "Missing '$scriptdir/mmfunctions'. Exiting." ; exit 1 ;};
 
 while [ "$*" != "" ] ; do
 
diff --git a/makelossless b/makelossless
index 4754c545..7e861b3b 100755
--- a/makelossless
+++ b/makelossless
@@ -1,8 +1,7 @@
 #!/bin/bash
 scriptdir=`dirname "$0"`
-. "$scriptdir/mmvariables"
-. "$scriptdir/mmfunctions"
-[ ! -f "$scriptdir/mmvariables" -o ! -f "$scriptdir/mmfunctions" ] && { echo "Missing '$scriptdir/mmvariables' and/or '$scriptdir/mmfunctions'. Exiting." ; exit 1 ;};
+. "$scriptdir/mmfunctions" || { echo "Missing '$scriptdir/mmfunctions'. Exiting." ; exit 1 ;};
+
 check_dependencies ffmpeg muxmovie mediainfo
 
 cleanup(){
diff --git a/makemetadata b/makemetadata
index cae9de7c..56c70e0e 100755
--- a/makemetadata
+++ b/makemetadata
@@ -3,8 +3,7 @@
 #produces errors on zero-sized files
 
 scriptdir=`dirname "$0"`
-. "$scriptdir/mmvariables"
-. "$scriptdir/mmfunctions"
+. "$scriptdir/mmfunctions" || { echo "Missing '$scriptdir/mmfunctions'. Exiting." ; exit 1 ;};
 
 cleanup(){
 	log -a "Process aborted"
diff --git a/makepodcast b/makepodcast
index 269381d2..19adccfe 100755
--- a/makepodcast
+++ b/makepodcast
@@ -4,9 +4,7 @@
 version="1.0"
 
 scriptdir=`dirname "$0"`
-. "$scriptdir/mmvariables"
-. "$scriptdir/mmfunctions"
-[ ! -f "$scriptdir/mmvariables" -o ! -f "$scriptdir/mmfunctions" ] && { echo "Missing '$scriptdir/mmvariables' and/or '$scriptdir/mmfunctions'. Exiting." ; exit 1 ;};
+. "$scriptdir/mmfunctions" || { echo "Missing '$scriptdir/mmfunctions'. Exiting." ; exit 1 ;};
 
 cleanup(){
 	log -a "Process aborted"
diff --git a/makeyoutube b/makeyoutube
index b5cf5ccc..3bd4a656 100755
--- a/makeyoutube
+++ b/makeyoutube
@@ -4,9 +4,7 @@
 version="1.0"
 
 scriptdir=`dirname "$0"`
-. "$scriptdir/mmvariables"
-. "$scriptdir/mmfunctions"
-[ ! -f "$scriptdir/mmvariables" -o ! -f "$scriptdir/mmfunctions" ] && { echo "Missing '$scriptdir/mmvariables' and/or '$scriptdir/mmfunctions'. Exiting." ; exit 1 ;};
+. "$scriptdir/mmfunctions" || { echo "Missing '$scriptdir/mmfunctions'. Exiting." ; exit 1 ;};
 
 cleanup(){
 	log -a "Process aborted"
diff --git a/mmfunctions b/mmfunctions
index 2554e9de..c3a82a42 100755
--- a/mmfunctions
+++ b/mmfunctions
@@ -1,3 +1,5 @@
+. "$scriptdir/mmvariables"
+
 get_iso8601(){
     date +%FT%T
 }
diff --git a/paperingest b/paperingest
index 6e5d4d9c..6e0143ca 100755
--- a/paperingest
+++ b/paperingest
@@ -1,8 +1,7 @@
 #!/bin/bash
 
 scriptdir=`dirname "$0"`
-. "$scriptdir/mmvariables"
-. "$scriptdir/mmfunctions"
+. "$scriptdir/mmfunctions" || { echo "Missing '$scriptdir/mmfunctions'. Exiting." ; exit 1 ;};
 
 cleanup(){
 	log -a "Process aborted"
diff --git a/quickcompare b/quickcompare
index 914b5252..a0522843 100755
--- a/quickcompare
+++ b/quickcompare
@@ -3,9 +3,7 @@ checksize=512000
 # quick file compare, not completely authoritative but decent in a short amount of time
 
 scriptdir=`dirname "$0"`
-. "$scriptdir/mmvariables"
-. "$scriptdir/mmfunctions"
-[ ! -f "$scriptdir/mmvariables" -o ! -f "$scriptdir/mmfunctions" ] && { echo "Missing '$scriptdir/mmvariables' and/or '$scriptdir/mmfunctions'. Exiting." ; exit 1 ;};
+. "$scriptdir/mmfunctions" || { echo "Missing '$scriptdir/mmfunctions'. Exiting." ; exit 1 ;};
 
 cleanup(){
 	log -a "Process aborted"
diff --git a/removeDSStore b/removeDSStore
index a34c9349..0e21432f 100755
--- a/removeDSStore
+++ b/removeDSStore
@@ -2,9 +2,7 @@
 # @author Dave Rice
 
 scriptdir=`dirname "$0"`
-. "$scriptdir/mmvariables"
-. "$scriptdir/mmfunctions"
-[ ! -f "$scriptdir/mmvariables" -o ! -f "$scriptdir/mmfunctions" ] && { echo "Missing '$scriptdir/mmvariables' and/or '$scriptdir/mmfunctions'. Exiting." ; exit 1 ;};
+. "$scriptdir/mmfunctions" || { echo "Missing '$scriptdir/mmfunctions'. Exiting." ; exit 1 ;};
 
 cleanup(){
 	log -a "Process aborted"
diff --git a/uploadomneon b/uploadomneon
index a688f25e..da676d9f 100755
--- a/uploadomneon
+++ b/uploadomneon
@@ -2,9 +2,7 @@
 # uploadomneon
 # upload to omneon
 scriptdir=`dirname "$0"`
-. "$scriptdir/mmvariables"
-. "$scriptdir/mmfunctions"
-[ ! -f "$scriptdir/mmvariables" -o ! -f "$scriptdir/mmfunctions" ] && { echo "Missing '$scriptdir/mmvariables' and/or '$scriptdir/mmfunctions'. Exiting." ; exit 1 ;};
+. "$scriptdir/mmfunctions" || { echo "Missing '$scriptdir/mmfunctions'. Exiting." ; exit 1 ;};
 
 cleanup(){
 	log -a "Process aborted"
diff --git a/xdcamingest b/xdcamingest
index aea0e6bb..c0878cd4 100755
--- a/xdcamingest
+++ b/xdcamingest
@@ -2,9 +2,7 @@
 # xdcamingest
 # ingest an xdcam disc, make a package, and deliver select files
 scriptdir=`dirname "$0"`
-. "$scriptdir/mmvariables"
-. "$scriptdir/mmfunctions"
-[ ! -f "$scriptdir/mmvariables" -o ! -f "$scriptdir/mmfunctions" ] && { report -wt "Missing '$scriptdir/mmvariables' and/or '$scriptdir/mmfunctions'. Exiting." ; exit 1 ;};
+. "$scriptdir/mmfunctions" || { echo "Missing '$scriptdir/mmfunctions'. Exiting." ; exit 1 ;};
 
 cleanup(){
 	log -a "Process aborted"