projects
/
rip_dvd
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
5158c7d
)
Tweaked "already running" check
author
Alan J. Pippin
<ajp@pippin.pippins.net>
Tue, 27 Apr 2010 14:34:32 +0000
(08:34 -0600)
committer
Alan J. Pippin
<ajp@pippins.net>
Tue, 27 Apr 2010 14:34:32 +0000
(08:34 -0600)
rip_dvd.wrap
patch
|
blob
|
history
diff --git
a/rip_dvd.wrap
b/rip_dvd.wrap
index e9bcb632c0810bd5788358246dc8c051d94eb4ea..3c09442de0d8d2cd2f4c3a87adfa14d5e43803ae 100755
(executable)
--- a/
rip_dvd.wrap
+++ b/
rip_dvd.wrap
@@
-7,9
+7,11
@@
##############################################
# Don't run if a previous rip attempt is still running
##############################################
# 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=$$
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
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"
##############################################
if [ -z "$dvdtype" ]; then
echo "-E- $0 <dvdtype>' is a required option"
- usage
+ exit 1
fi
mydir=$(cd $(dirname $0) && pwd)
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"'
rip_opts="$rip_opts"
else
echo '-E- Must specify dvdtype as "netflix" or "collection" or "childrens" or "church"'
- usage
+ exit 1
fi
##############################################
fi
##############################################