From 7816a05e9aeb304afefd1dc2a78169e63016a300 Mon Sep 17 00:00:00 2001
From: Morgan Aldridge <morgant@makkintosshu.com>
Date: Thu, 8 Dec 2016 18:29:52 -0500
Subject: [PATCH] Track the PID in the .BasiliskIIVM package.

---
 basiliskiivm | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/basiliskiivm b/basiliskiivm
index b24a5ae..6795db6 100755
--- a/basiliskiivm
+++ b/basiliskiivm
@@ -21,14 +21,9 @@ version="0.1"
 copyright="Copyright (c) 2016 Morgan Aldridge"
 
 # global variables
-user="$(whoami)"
 BASILISKII_BINARY="${BASILISKII_BINARY:=BasiliskII}"
-if [ "$user" == "root" ]; then
-	PID_FILE_PATH="${PID_FILE_PATH:="/var/run/${tool}"}"
-else
-	PID_FILE_PATH="${PID_FILE_PATH:="${HOME}/.${tool}"}"
-fi
 basiliskii_prefs_file=".basilisk_ii_prefs"
+basiliskii_pid_file=".basiliskii.pid"
 
 function usage() {
 	echo "Usage: ${tool} [options] <command>"
@@ -67,7 +62,7 @@ function vm_pkg_config_file() {
 	
 	local vm="$(vm_pkg_name "$1")"
 	if [ -n "$vm" ]; then
-		local prefs_file="$1/${basiliskii_prefs_file}"
+		local prefs_file="${1}/${basiliskii_prefs_file}"
 		if [ -f "$prefs_file" ]; then
 			echo "$prefs_file"
 			sucess=true	
@@ -82,7 +77,7 @@ function vm_is_running() {
 	
 	local vm="$(vm_pkg_name "$1")"
 	if [ -n "$vm" ]; then
-		local pid_path="${PID_FILE_PATH}/${vm}.pid"
+		local pid_path="${1}/${basiliskii_pid_file}"
 		if [ -f "$pid_path" ]; then
 			if ps -p "$(cat "$pid_path")" > /dev/null 2>&1; then
 				running=true
@@ -98,12 +93,7 @@ function vm_create_pid_file() {
 	
 	local vm="$(vm_pkg_name "$1")"
 	if [ -n "$vm" ]; then
-		local pid_path="${PID_FILE_PATH}/${vm}.pid"
-		
-		# create the pid file directory, if necessary
-		if [ ! -d "$PID_FILE_PATH" ]; then
-			mkdir "${PID_FILE_PATH}"
-		fi
+		local pid_path="${1}/${basiliskii_pid_file}"
 		
 		# create the pid file
 		if ! echo "$2" > "$pid_path"; then
@@ -121,7 +111,7 @@ function vm_delete_pid_file() {
 	
 	local vm="$(vm_pkg_name "$1")"
 	if [ -n "$vm" ]; then
-		local pid_path="${PID_FILE_PATH}/${vm}.pid"
+		local pid_path="${1}/${basiliskii_pid_file}"
 	
 		if [ ! -f "$pid_path" ]; then
 			echo "ERROR! The '$vm' BasiliskII VM PID file '$pid_path' doesn't exist, so cannot delete it."