Merge pull request #3 from jimmyatSplunk/develop

Update for reading app context

Author: codingWithJimmy

.gitignore

@@ -0,0 +1,3 @@
+*.db
+.idea
+.DS_Store

DeleteMeToRestart renamed to bin/DeleteMeToRestart

@@ -0,0 +1,4 @@
+#!/bin/bash
+## Grab the current app context
+SCRIPT_PATH=$(realpath $0)
+APP_PATH=$(dirname ${SCRIPT_PATH})

bin/appContext.sh

@@ -31,8 +31,8 @@ if ($restartInput -eq "True" -OR $restartServer -eq "True" -OR $restartDS -eq "T
 	if ($restartDateTime -eq "True") {
 		Remove-Item -path "$dateTimePath"
 	}
-	Remove-Item -path "$SPLUNKHOME\etc\apps\SplunkForwarderRepairKit\DeleteMeToRestart"
+	Remove-Item -path "$PSScriptRoot\DeleteMeToRestart"
 } else {
 	Write-output "No settings have been changed." | timestamp
 	Write-output "No restart required." | timestamp
-}
+}

bin/restart.ps1

@@ -1,4 +1,7 @@
 #!/bin/bash
+### Source the appPath script to pull proper app context
+source appContext.sh
+
 ### Configure the path to the restart_check.txt file on the system
 RESTARTINPUT="$SPLUNK_HOME/etc/restartinput.txt"
 RESTARTSERVER="$SPLUNK_HOME/etc/restartserver.txt"
@@ -25,7 +28,7 @@ if [ -f "$RESTARTINPUT" ] || [ -f "$RESTARTSERVER" ] || [ -f "$RESTARTDS" ] || [
 	if [ -f "$RESTARTDATETIME" ]; then
 		rm -f "$RESTARTDATETIME"
 	fi
-	rm -f $SPLUNK_HOME/etc/apps/SplunkForwarderRepairKit/DeleteMeToRestart
+	rm -f "${APP_PATH}/DeleteMeToRestart"
 else
 	echo "$(date +"%Y-%m-%d %H:%M:%S.%3N") ${HOSTNAME}: No settings have been changed."
 	echo "$(date +"%Y-%m-%d %H:%M:%S.%3N") ${HOSTNAME}: No restart required."