From: Alan J. Pippin <ajp@pippin.pippins.net>
Date: Tue, 27 Apr 2010 14:34:32 +0000 (-0600)
Subject: Tweaked "already running" check
X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=commitdiff_plain;h=1d8e9d026a6c29f2aeba496dfa2ae8d3a8253f91;p=rip_dvd%2F.git

Tweaked "already running" check
---

diff --git a/rip_dvd.wrap b/rip_dvd.wrap
index e9bcb63..3c09442 100755
--- a/rip_dvd.wrap
+++ b/rip_dvd.wrap
@@ -7,9 +7,11 @@
 
 ##############################################
 # 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
+ps -ef | grep -e "$SCRIPT_NAME1" -e "$SCRIPT_NAME2" | grep -v grep | grep -v $MY_PID | grep -v $PARENT_PID
 if [[ $? == 0 ]]; then
   echo -e "-E- Found an instance of this script already running. Aborting this additional attempt to rip...\n"
   exit 1
@@ -28,7 +30,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 +110,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
 
 ##############################################