Fixed default 6ch audio option. It wasn't truly the default before.

[rip_dvd/.git] / rip_dvd.wrap

diff --git a/rip_dvd.wrap b/rip_dvd.wrap
index e9bcb632c0810bd5788358246dc8c051d94eb4ea..8454da76836bad74d377c4dd7f2d107cb575ac13 100755 (executable)
--- a/rip_dvd.wrap
+++ b/rip_dvd.wrap
@@ -7,11 +7,21 @@
 
 ##############################################
 # Don't run if a previous rip attempt is still running
-SCRIPT_NAME=${0##*/}
+SCRIPT_NAME1="rip_dvd.wrap"
+SCRIPT_NAME2="xterm -T Ripping"
 MY_PID=$$
-ps -ef | grep $SCRIPT_NAME | grep -v grep | grep -v emacs | grep -v vi | grep -v "/bin/sh -c" | grep -v $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
 if [[ $? == 0 ]]; then
-  echo -e "-E- Found an instance of this script already running. Aborting this additional attempt to rip...\n"
+  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"
+  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
+  ps -ef | grep $MY_PID | grep -v grep
+  ps -ef | grep $PARENT_PID | grep -v grep
   exit 1
 fi
 
@@ -28,7 +38,7 @@ shift 1
 ##############################################
 if [ -z "$dvdtype" ]; then
   echo "-E- $0 <dvdtype>' is a required option"
-  usage
+  exit 1
 fi
 
 mydir=$(cd $(dirname $0) && pwd)
@@ -108,7 +118,7 @@ elif [ "$dvdtype" == "church" ]; then
   rip_opts="$rip_opts"
 else
   echo '-E- Must specify dvdtype as "netflix" or "collection" or "childrens" or "church"'
-  usage
+  exit 1
 fi
 
 ##############################################