X-Git-Url: http://git.pippins.net/embedvideo/.git/.%24link.?a=blobdiff_plain;f=rip_dvd.wrap;h=95af1e951230117cc8a45d7d9147e700bc9ba9f0;hb=238ad23548a670aa46a586cf76095abf00e00f12;hp=8454da76836bad74d377c4dd7f2d107cb575ac13;hpb=1077c0f3b98965275bfb91f4b59ac0d068e2190e;p=rip_dvd%2F.git

diff --git a/rip_dvd.wrap b/rip_dvd.wrap
index 8454da7..95af1e9 100755
--- a/rip_dvd.wrap
+++ b/rip_dvd.wrap
@@ -13,10 +13,10 @@ MY_PID=$$
 PARENT_PID=$PPID
 GRAND_PID=$(ps -ef | grep "^[a-zA-Z]* [ ]* $PARENT_PID " | awk '{print $3}')
 GREAT_GRAND_PID=$(ps -ef | grep "^[a-zA-Z]* [ ]* $GRAND_PID " | awk '{print $3}')
-ps -ef | grep -e "$SCRIPT_NAME1" -e "$SCRIPT_NAME2" | grep -v grep | grep -v $MY_PID | grep -v $PARENT_PID | grep -v $GRAND_PID
+ps -ef | grep -e "$SCRIPT_NAME1" -e "$SCRIPT_NAME2" | grep -v grep | grep -v $MY_PID | grep -v $PARENT_PID | grep -v $GRAND_PID | grep -v $GREAT_GRAND_PID
 if [[ $? == 0 ]]; then
   echo -e "-E- Found an instance of this script already running. Aborting this additional attempt to rip..."
-  echo -e "    my_pid=$MY_PID parent_pid=$PARENT_PID\n"
+  echo -e "    my_pid=$MY_PID parent_pid=$PARENT_PID grand_pid=$GRAND_PID great_grand_pid=$GREAT_GRAND_PID\n"
   CALLER=$(ps -ef | grep "^[a-zA-Z]* [ ]* $PPID " | awk '{print $3}')
   CALLER_CALLER=$(ps -ef | grep "^[a-zA-Z]* [ ]* $CALLER " | awk '{print $3}')
   echo I was called from $CALLER who was called by $CALLER_CALLER
@@ -102,19 +102,19 @@ dvdname=${dvdname%.} # remove trailing '.' character
 rip_opts="$* -j 2"
 if [ "$dvdtype" == "netflix" ]; then
   echo "-> Ripping Netflix DVD"
-  dest=/myth/video/DVDs/Netflix
+  dest=/myth/video/Movies/Netflix
   rip_opts="$rip_opts"
 elif [ "$dvdtype" == "collection" ]; then
   echo "-> Ripping Personal Collection DVD"
-  dest=/myth/video/DVDs/Collection
+  dest=/myth/video/Movies/Collection
   rip_opts="$rip_opts"
 elif [ "$dvdtype" == "childrens" ]; then
   echo "-> Ripping Children's DVD"
-  dest=/myth/video/DVDs/Childrens
+  dest=/myth/video/Movies/Childrens
   rip_opts="$rip_opts"
 elif [ "$dvdtype" == "church" ]; then
   echo "-> Ripping Church DVD"
-  dest=/myth/video/DVDs/Church
+  dest=/myth/video/Movies/Church
   rip_opts="$rip_opts"
 else
   echo '-E- Must specify dvdtype as "netflix" or "collection" or "childrens" or "church"'