Fixed a number of typos

[rip_dvd/.git] / rip_dvd.wrap

diff --git a/rip_dvd.wrap b/rip_dvd.wrap
index 0b9825f5cf67cebd6757799230ad95601abcd8e4..b959fe66155f3d8d186ca881b2e3379deec74de3 100755 (executable)
--- a/rip_dvd.wrap
+++ b/rip_dvd.wrap
@@ -1,6 +1,8 @@
 #!/bin/bash
 
 ##############################################
+# COMMAND LINE PROCESSING
+
 # get the dvdtype from the command line
 dvdtype=$1
 
@@ -8,25 +10,32 @@ dvdtype=$1
 # of the args to be passed directly to the rip_dvd script.
 shift 1
 
-# specify the device path to your DVD drive
-dev=/dev/dvd2
-
-# specify the path to the rip_dvd script
-ripcmd="/myth/video/bin/rip_dvd"
-
-# get the name of the DVD from the DVD disk
-dvdname=`volname $dev | awk '{ print $1 }'`
-dvdname=${dvdname%.} # remove trailing '.' character
-
 ##############################################
 if [ -z "$dvdtype" ]; then
   echo "-E- $0 <dvdtype>' is a required option"
   usage
 fi
 
+##############################################################################
+# Local Machine Settings:
+# Sources both the "default" conf file tracked by GIT (rip_dvd.conf.dist)
+# and the local conf file created by each local machine (rip_dvd.conf)
+# Copy the rip_dvd.conf.dist file to rip_dvd.conf and edit the later.
+# This will allow you to override all the default values to meet your needs
+# in a way that won't get clobbered when you pull updates from my GIT repo.
+##############################################################################
+config="${0%/*}/rip_dvd.conf"
+[ -e "${config}.dist" ] && . ${config}.dist
+[ -e "${config}" ] && . ${config}
+
+##############################################
+# get the name of the DVD from the DVD disk
+dvdname=`volname $dev | awk '{ print $1 }'`
+dvdname=${dvdname%.} # remove trailing '.' character
+
 ##############################################
 # Find out what type of DVD we are ripping
-# And set our destination directory appropriatel
+# And set our destination directory appropriately
 # dvdtype parameter:
 # - netflix = DVD ripped as an entire ISO image
 #   since these are only kept around until we watch them,
@@ -47,7 +56,7 @@ elif [ "$dvdtype" == "childrens" ]; then
   echo "-> Ripping Children's DVD"
   dest=/myth/video/DVDs/Childrens
   rip_opts="$rip_opts"
-elif [ "$dvdtype" == "childrens" ]; then
+elif [ "$dvdtype" == "church" ]; then
   echo "-> Ripping Church DVD"
   dest=/myth/video/DVDs/Church
   rip_opts="$rip_opts"
@@ -64,7 +73,7 @@ echo "xterm -T \"Ripping->$dvdname\" -geometry 72x15+20+10 -bg black -fg white -
 xterm -T "Ripping->$dvdname" -geometry 72x15+20+10 -bg black -fg white -e "/bin/bash" -c "$ripcmd -d $dest $rip_opts" &
 
 ##############################################
-# OR run the script directly without displaying a progress window
+# OR display the script output directly in the terminal it's called from
 #$ripcmd -d $dest $rip_opts
 
 ##############################################