diff --git a/lib/monitor.sh b/lib/monitor.sh
index 7ad2ad2..38e8428 100644
--- a/lib/monitor.sh
+++ b/lib/monitor.sh
@@ -4,11 +4,7 @@ install_monitor_launchdaemon() {
[ -n "$data_mount" ] && root="$data_mount"
local unleash_src
- if [ -n "$SCRIPT_DIR" ]; then
- unleash_src="$SCRIPT_DIR/unleash"
- else
- unleash_src="$(cd "$(dirname "$0")" && pwd)/unleash"
- fi
+ unleash_src=$(_launchd_script_path)
step "Installing monitor LaunchDaemon..."
@@ -26,8 +22,8 @@ install_monitor_launchdaemon() {
ProgramArguments
/bin/bash
- -c
- ${unleash_src} monitor
+ ${unleash_src}
+ monitor
RunAtLoad
diff --git a/tests/test_monitor.bats b/tests/test_monitor.bats
index e23e640..5c414b6 100644
--- a/tests/test_monitor.bats
+++ b/tests/test_monitor.bats
@@ -2,8 +2,10 @@
setup() {
load '../lib/colors.sh'
+ load '../lib/launchd.sh'
load '../lib/monitor.sh'
TEST_DIR=$(mktemp -d)
+ SCRIPT_PATH="$TEST_DIR/unleash"
}
teardown() {
diff --git a/tests/test_persistence.bats b/tests/test_persistence.bats
index 31e6706..fac58a8 100644
--- a/tests/test_persistence.bats
+++ b/tests/test_persistence.bats
@@ -1,6 +1,7 @@
#!/usr/bin/env bats
-@test "persistence invokes renamed scripts with spaces and XML text literally" {
+check_daemon_path() {
+ local installer="$1" action="$2" label="$3"
local entrypoint
for entrypoint in unleash unleash-standalone.sh; do
local folder="$BATS_TEST_TMPDIR/$entrypoint/Tool Folder & \"quoted\""
@@ -21,19 +22,27 @@
[ "$#" -eq 2 ] && [ "$1" = -p ] && [ "$2" = "$expected" ] || return 97
command mkdir "$@"
}
- install_persist_launchdaemon "$2"
- ' "$script" "$definitions" "$target"
+ "$3" "$2"
+ ' "$script" "$definitions" "$target" "$installer"
[ "$status" -eq 0 ]
- run python3 - "$target/Library/LaunchDaemons/com.unleash.heal.plist" "$script" <<'PY'
+ run python3 - "$target/Library/LaunchDaemons/$label.plist" "$script" "$action" <<'PY'
import plistlib,subprocess,sys
with open(sys.argv[1],'rb') as source:
data=plistlib.load(source)
-expected=['/bin/bash',sys.argv[2],'heal']
+expected=['/bin/bash',sys.argv[2],sys.argv[3]]
assert data['ProgramArguments']==expected, data['ProgramArguments']
result=subprocess.run(expected,capture_output=True,text=True,timeout=5)
assert result.returncode==0, result.stderr
-assert result.stdout=='ACTION=heal\n', result.stdout
+assert result.stdout=='ACTION='+sys.argv[3]+'\n', result.stdout
PY
[ "$status" -eq 0 ]
done
}
+
+@test "persistence invokes renamed scripts with spaces and XML text literally" {
+ check_daemon_path install_persist_launchdaemon heal com.unleash.heal
+}
+
+@test "monitor invokes renamed scripts with spaces and XML text literally" {
+ check_daemon_path install_monitor_launchdaemon monitor com.unleash.monitor
+}
diff --git a/unleash-standalone.sh b/unleash-standalone.sh
index b5a1bde..e029d46 100755
--- a/unleash-standalone.sh
+++ b/unleash-standalone.sh
@@ -1552,11 +1552,7 @@ install_monitor_launchdaemon() {
[ -n "$data_mount" ] && root="$data_mount"
local unleash_src
- if [ -n "$SCRIPT_DIR" ]; then
- unleash_src="$SCRIPT_DIR/unleash"
- else
- unleash_src="$(cd "$(dirname "$0")" && pwd)/unleash"
- fi
+ unleash_src=$(_launchd_script_path)
step "Installing monitor LaunchDaemon..."
@@ -1574,8 +1570,8 @@ install_monitor_launchdaemon() {
ProgramArguments
/bin/bash
- -c
- ${unleash_src} monitor
+ ${unleash_src}
+ monitor
RunAtLoad