Fancify script.

cronjob.sh

@@ -4,26 +4,37 @@
 #  project so that docker container can do periodic git pulls rather than having
 #  to reload /rebuild the container each time a release is pushed out.
 
+## Setup ##
+
 DIR="$(dirname -- "${BASH_SOURCE[0]}")"
 PROG="$(basename -- "${BASH_SOURCE[0]}")"
+cd $DIR
+DIR="`pwd`"
+NAME="'$PROG'"
+
+function log {
+	echo -e "`date` : $NAME - $1"
+}
 
 function reload-project {
 	## Kill node.js which will complete run.sh and restart any Docker containers.
 	#pkill node
 	# Do not kill program, just use the new files and if run.sh or main.js were
 	#  changed then they can get reloaded manually or by the nightly backup.
-	echo "Project reloaded successfully!"
+	log "Project reloaded successfully!"
 }
 
-echo "*** Running '$DIR/$PROG' @ `date` ***"
+## Main ##
+
+log "Checking for updates..."
 cd $DIR
 
 # Pull any updates, and if the project is already up to date, exit successfully.
 git pull | grep -v "up to date"
 status="$?"
-echo "* Pull status is '$status'."
+log "Pull status is '$status'."
 if [[ $status != 0 ]]; then
-	echo "* Site is already up to date, exiting."
+	log "Site is already up to date, exiting."
 	exit 0
 else
 	reload-project

run.sh

@@ -6,7 +6,12 @@
 
 DIR="$(dirname -- "${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 ##
 
@@ -27,13 +32,15 @@ function log {
 	echo -e "`date` - $message"
 }
 
+log "Local process information:"
+ps $$
 function check_main {
 	if [[ -z "$1" ]]; then
 		echo "ERROR: Subprocess name was not provided. $1"
 		exit 0
 	fi
 	log "Subprocess '$1' checking if main process is still running..."
-	ps $$
+	ps $$ >/dev/null
 	status=$?
 	if [[ $status != 0 ]]; then
 		log "Process '$$' not found, '$1' from '$DIR/$PROG' exiting."
@@ -62,9 +69,6 @@ fi
 
 ## Build Environment ##
 
-# Ensure we are executing from this file's directory.
-cd $DIR
-
 sudo=""
 if [[ -z $LOGNAME ]]; then
 	LOGNAME="`whoami`"