X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;ds=sidebyside;f=rip_dvd.wrap;h=b959fe66155f3d8d186ca881b2e3379deec74de3;hb=754d450bb4caeb775d08a3424deb63e5d545afbd;hp=0e17bed1fcdfd0db371710f9ed6d47df014b0f35;hpb=f503e6e8fde1db01798d33c5af3a7499da305a74;p=rip_dvd%2F.git

diff --git a/rip_dvd.wrap b/rip_dvd.wrap
index 0e17bed..b959fe6 100755
--- a/rip_dvd.wrap
+++ b/rip_dvd.wrap
@@ -1,17 +1,14 @@
 #!/bin/bash
 
 ##############################################
+# COMMAND LINE PROCESSING
+
 # get the dvdtype from the command line
 dvdtype=$1
+
 # remove the dvdtype from the args, and interpret the rest
 # 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 }'`
 
 ##############################################
 if [ -z "$dvdtype" ]; then
@@ -19,15 +16,33 @@ if [ -z "$dvdtype" ]; then
   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,
 #   there is no need to do anything less than full iso.
 # - collection = Only DVD main feature is ripped
 # - childrens = Only DVD main feature is ripped
+# - church = Only DVD main feature is ripped
 rip_opts="$*"
 if [ "$dvdtype" == "netflix" ]; then
   echo "-> Ripping Netflix DVD"
@@ -41,20 +56,24 @@ elif [ "$dvdtype" == "childrens" ]; then
   echo "-> Ripping Children's DVD"
   dest=/myth/video/DVDs/Childrens
   rip_opts="$rip_opts"
+elif [ "$dvdtype" == "church" ]; then
+  echo "-> Ripping Church DVD"
+  dest=/myth/video/DVDs/Church
+  rip_opts="$rip_opts"
 else
-  echo '-E- Must specify dvdtype as "netflix" or "collection" or "childrens"'
+  echo '-E- Must specify dvdtype as "netflix" or "collection" or "childrens" or "church"'
   usage
 fi
 
 ##############################################
-# Display progress window in mythtv
+# Display progress window
 
 # Pop up an xterm window and run the script inside of it
 echo "xterm -T \"Ripping->$dvdname\" -geometry 72x15+20+10 -bg black -fg white -e \"/bin/bash\" -c \"$ripcmd -d $dest $rip_opts\" &"
 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
+# OR display the script output directly in the terminal it's called from
 #$ripcmd -d $dest $rip_opts
 
 ##############################################