Use full executable path. Move the ps
information out of the loop to prevent log spam.
This commit is contained in:
14
run.sh
14
run.sh
@@ -6,7 +6,12 @@
|
|||||||
|
|
||||||
DIR="$(dirname -- "${BASH_SOURCE[0]}")"
|
DIR="$(dirname -- "${BASH_SOURCE[0]}")"
|
||||||
PROG="$(basename -- "${BASH_SOURCE[0]}")"
|
PROG="$(basename -- "${BASH_SOURCE[0]}")"
|
||||||
echo "$DIR/$PROG"
|
|
||||||
|
# Ensure we are executing from this file's directory.
|
||||||
|
cd $DIR
|
||||||
|
DIR="`pwd`"
|
||||||
|
NAME="'$DIR/$PROG'"
|
||||||
|
echo $NAME
|
||||||
|
|
||||||
## Functions ##
|
## Functions ##
|
||||||
|
|
||||||
@@ -27,13 +32,15 @@ function log {
|
|||||||
echo -e "`date` - $message"
|
echo -e "`date` - $message"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
log "Local process information:"
|
||||||
|
ps $$
|
||||||
function check_main {
|
function check_main {
|
||||||
if [[ -z "$1" ]]; then
|
if [[ -z "$1" ]]; then
|
||||||
echo "ERROR: Subprocess name was not provided. $1"
|
echo "ERROR: Subprocess name was not provided. $1"
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
log "Subprocess '$1' checking if main process is still running..."
|
log "Subprocess '$1' checking if main process is still running..."
|
||||||
ps $$
|
ps $$ >/dev/null
|
||||||
status=$?
|
status=$?
|
||||||
if [[ $status != 0 ]]; then
|
if [[ $status != 0 ]]; then
|
||||||
log "Process '$$' not found, '$1' from '$DIR/$PROG' exiting."
|
log "Process '$$' not found, '$1' from '$DIR/$PROG' exiting."
|
||||||
@@ -62,9 +69,6 @@ fi
|
|||||||
|
|
||||||
## Build Environment ##
|
## Build Environment ##
|
||||||
|
|
||||||
# Ensure we are executing from this file's directory.
|
|
||||||
cd $DIR
|
|
||||||
|
|
||||||
sudo=""
|
sudo=""
|
||||||
if [[ -z $LOGNAME ]]; then
|
if [[ -z $LOGNAME ]]; then
|
||||||
LOGNAME="`whoami`"
|
LOGNAME="`whoami`"
|
||||||
|
Reference in New Issue
Block a user