Updated rip_dvd.conf sourcing algorithm in rip_dvd.wrap to match rip_dvd

Updated README file with additional instructions.

diff --git a/README b/README
index e13e50dedfdf3bd2d9fe76d5539eb4ac494815d3..81c3c1b32a37cf24cac5eba724cff1ab0f4ba9fc 100644 (file)
--- a/README
+++ b/README
@@ -12,6 +12,11 @@ volname makexml lsdvd dvdauthor gddrescue dvdbackup mencoder mplayer mkisofs
 Optional Dependencies:
 lookup imdb info/posters for mythvideo: http://www.mythtv.org/wiki/Fill_mythvideo_metadata.pl
 
+Windows Dependencies:
+To play back the videos in windows that use the divx encoding profiles, you'll
+need to download and install the xvid codec:
+http://www.koepi.info/xvid.html
+
 ----------------------------------------------
 INSTALL
 ----------------------------------------------
@@ -83,6 +88,13 @@ rip_dvd_menu.xml file. You can take a look at this entry in this file
 and place it in any xml file you want to get it on the menu you want.
 I choose to place it on the optical menu.
 
+The menu items in these examples call the rip_dvd.wrap script.
+This is a simple script I wrote to implementation hide the full
+command line options for rip_dvd from the mythtv menu system.
+I also use this wrapper script to determine where to put the
+ripped DVD images. You can copy this example and call it something
+else on your system and change it appropriately to meet your needs.
+
 ----------------------------------------------
 COMMAND LINE EXAMPLES
 ----------------------------------------------

diff --git a/rip_dvd.wrap b/rip_dvd.wrap
index 09ba254ffeed64e59387320b41141965d27b64c4..fdfee25d0fac2aa0407d57251f9ed82cbc2de49b 100755 (executable)
--- a/rip_dvd.wrap
+++ b/rip_dvd.wrap
@@ -25,8 +25,27 @@ fi
 # 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}
+
+# The config file will be searched for in the following location order:
+found_config=0
+
+# 1) /path/to/rip_dvd/script/rip_dvd.conf.dist
+[ -e "${config}.dist" ] && found_config=1 && . "${config}.dist"
+
+# 2) /path/to/rip_dvd/script/rip_dvd.conf
+[ -e "${config}" ] && found_config=1 && . "${config}"
+
+# 3) /etc/rip_dvd.conf
+[ -e "/etc/rip_dvd.conf" ] && found_config=1 && . "/etc/rip_dvd.conf"
+
+# 4) $PWD/rip_dvd.conf
+[ -e "$PWD/rip_dvd.conf" ] && found_config=1 && . "$PWD/rip_dvd.conf"
+
+# Check to make sure we found the config file
+if [ $found_config -eq 0 ]; then
+  echo "-E- Unable to find the rip_dvd.conf file: $config"
+  exit 1
+fi
 
 ##############################################
 # get the name of the DVD from the DVD disk