Moved local configuration sourcing to occur after global variables are defined.

This will enable a user to override any of the default variables in their conf file.

diff --git a/rip_dvd b/rip_dvd
index ed395b2e409c17d44393bbdd0e25d479519fc4a1..754cda7c6d16746f3b8161ab17a32563d8bc9059 100755 (executable)
--- a/rip_dvd
+++ b/rip_dvd
@@ -25,20 +25,8 @@
 # lookup imdb info/posters for mythvideo: http://www.mythtv.org/wiki/Fill_mythvideo_metadata.pl
 #
 
-##############################################################################
-# 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}
-
 ##############################################################################################
-# Command line processing
+# Global Variables
 ##############################################################################################
 typeset cmd="$0 $*"
 typeset dvdname=""
@@ -72,6 +60,21 @@ typeset -i invalid_feature_title=0
 typeset -i feature_title_override=0
 typeset -i mplayer_dumpstream_incompatibility=0
 
+##############################################################################
+# 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}
+
+##############################################################################################
+# Command line processing
+##############################################################################################
 while (($#)) && getopts 12mvifkxht:n:d:b:s:t:a:p:e:j: opt "$@"
 do
     case $opt in

diff --git a/rip_dvd.conf.dist b/rip_dvd.conf.dist
index b2a5669e39437c74353d113795c324350321db6b..da1dad64cabcadc8bfbf7d91fae7c3786142ac8b 100644 (file)
--- a/rip_dvd.conf.dist
+++ b/rip_dvd.conf.dist
@@ -3,6 +3,7 @@
 # - rip_dvd.conf.dist = contains default values (tracked by GIT)
 # - rip_dvd.conf = contains localized overrides to the default values (not tracked by GIT)
 #                  should initially be created by copying the rip_dvd.conf.dist
+# 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