Merge commit 'origin'

diff --git a/README b/README
index 93c6860f5f381b7543cb1c8804558a1be18460c0..235eb88a5e70054dbd5e40e40587a12bb541956e 100644 (file)
--- a/README
+++ b/README
@@ -6,8 +6,16 @@ The following packages need to be installed on your system:
 Package Dependencies (apt-get install these for example):
 lsdvd dvdauthor gddrescue dvdbackup tovid mencoder mplayer genisoimage libdvdcss2
 
+NOTE:  In Ubuntu, depending on your version, replace libdvdcss2 with what you find on this page.
+  https://help.ubuntu.com/community/RestrictedFormats/PlayingDVDs
+
+NOTE:  After apt-get install on Ubuntu you may need to run this:
+  sudo /usr/share/doc/libdvdread4/install-css.sh
+
 Specific Executable (program) Dependencies (must be found in $PATH):
-volname makexml lsdvd dvdauthor gddrescue dvdbackup mencoder mplayer mkisofs
+volname makexml lsdvd dvdauthor ddrescue dvdbackup mencoder mplayer mkisofs
+
+NOTE:  The script puts /usr/share/tovid on your path which should contain makexml
 
 Optional Dependencies:
 lookup imdb info/posters for mythvideo: http://www.mythtv.org/wiki/Fill_mythvideo_metadata.pl

diff --git a/rip_dvd b/rip_dvd
index 4b3223865d79d429311a2ea44a742d4ad94b277a..04a32eff235f908794ae605dc9a577dfd880647e 100755 (executable)
--- a/rip_dvd
+++ b/rip_dvd
@@ -15,15 +15,8 @@
 # Known Issues/Limitations:
 # - Mirror mode is always done in ISO mode
 #
-# Package Dependencies (apt-get install these for example):
-# lsdvd dvdauthor gddrescue dvdbackup tovid mencoder mplayer genisoimage libdvdcss2
-#
-# Specific Executable (program) Dependencies (must be found in $PATH):
-# volname makexml lsdvd dvdauthor gddrescue dvdbackup mencoder mplayer mkisofs HandBrakeCLI
-#
-# Optional Dependencies:
-# lookup imdb info/posters for mythvideo: http://www.mythtv.org/wiki/Fill_mythvideo_metadata.pl
-#
+# See the README file for information about the dependencies
+# this script has.
 
 ##############################################################################################
 # Global Variables

diff --git a/rip_dvd.conf.dist b/rip_dvd.conf.dist
index 42504ace84954ea47c901f6c05e23896f3332376..53949a33d4a19431215877a2457834cbbfb71ded 100644 (file)
--- a/rip_dvd.conf.dist
+++ b/rip_dvd.conf.dist
@@ -6,8 +6,9 @@
 # NOTE: You can override ANY of the global variables listed in the top of rip_dvd here
 ###########################################################################################
 
-# specify the path to the rip_dvd script
-ripcmd="/myth/video/bin/rip_dvd"
+# specify the path to the rip_dvd script (no need to do this if rip_dvd is in
+# the same directory as the rip_dvd.wrap script (which is likely).
+# ripcmd="/myth/video/bin/rip_dvd"
 
 # Specify the device path to the DVD drive
 dev=/dev/dvd

diff --git a/rip_dvd.wrap b/rip_dvd.wrap
index 128581d602842ee745303ed081ae561ee3b2ddfe..76fcb3ccd62883d2b6f136cf562beaa69939c350 100755 (executable)
--- a/rip_dvd.wrap
+++ b/rip_dvd.wrap
@@ -21,6 +21,18 @@ if [ -z "$dvdtype" ]; then
   usage
 fi
 
+mydir=$(cd $(dirname $0) && pwd)
+if [ -z "$ripcmd" ]
+then
+  if [ -x "$mydir/rip_dvd" ]
+  then
+    ripcmd="$mydir/rip_dvd"
+  else
+    echo >&2 "Cannot find your rip_dvd command!"
+    exit 1
+  fi
+fi
+
 ##############################################################################
 # Local Machine Settings:
 # Sources both the "default" conf file tracked by GIT (rip_dvd.conf.dist)