projects
/
rip_dvd
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f34156e
)
Fixed sourcing of $PWD/rip_dvd.conf file if present
author
Alan J. Pippin
<ajp@pippins.net>
Wed, 27 May 2009 13:53:02 +0000
(07:53 -0600)
committer
Alan J. Pippin
<ajp@pippins.net>
Wed, 27 May 2009 13:53:02 +0000
(07:53 -0600)
rip_dvd
patch
|
blob
|
history
diff --git
a/rip_dvd
b/rip_dvd
index 9e13ae37042121c2e18148ca20c972a190224a4b..ebcd87ff162d2e652ec0c60330d8e050534ea39c 100755
(executable)
--- a/
rip_dvd
+++ b/
rip_dvd
@@
-40,6
+40,7
@@
typeset SCALE=""
typeset CROP=""
typeset profile="xvidvhq"
typeset extension=""
typeset CROP=""
typeset profile="xvidvhq"
typeset extension=""
+typeset mailto=""
typeset -i force_onepass_mode=0
typeset -i eject_disk=1
typeset -i keep_isofile=0
typeset -i force_onepass_mode=0
typeset -i eject_disk=1
typeset -i keep_isofile=0
@@
-74,16
+75,16
@@
config="${0%/*}/rip_dvd.conf"
found_config=0
# 1) /path/to/rip_dvd/script/rip_dvd.conf.dist
found_config=0
# 1) /path/to/rip_dvd/script/rip_dvd.conf.dist
-[ -e "${config}.dist" ] && found_config=1 && .
${config}.dist
+[ -e "${config}.dist" ] && found_config=1 && .
"${config}.dist"
# 2) /path/to/rip_dvd/script/rip_dvd.conf
# 2) /path/to/rip_dvd/script/rip_dvd.conf
-[ -e "${config}" ] && found_config=1 && .
${config}
+[ -e "${config}" ] && found_config=1 && .
"${config}"
# 3) /etc/rip_dvd.conf
# 3) /etc/rip_dvd.conf
-[ -e "/etc/rip_dvd.conf" ] && found_config=1 && .
/etc/rip_dvd.conf
+[ -e "/etc/rip_dvd.conf" ] && found_config=1 && .
"/etc/rip_dvd.conf"
# 4) $PWD/rip_dvd.conf
# 4) $PWD/rip_dvd.conf
-[ -e "
rip_dvd.conf" ] && found_config=1 && . 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
# Check to make sure we found the config file
if [ $found_config -eq 0 ]; then