From d035e85561e50b0d7c2838739afaefbe14286754 Mon Sep 17 00:00:00 2001 From: Will Greenberg Date: Mon, 18 Nov 2024 16:05:12 -0800 Subject: [PATCH 1/3] fix installer script With the odd permissions issues we've been seeing, we should use AT_SYSCMD for all mv operations into /data --- dist/install-common.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dist/install-common.sh b/dist/install-common.sh index e894a6a..5cc8363 100755 --- a/dist/install-common.sh +++ b/dist/install-common.sh @@ -65,14 +65,18 @@ _at_syscmd() { setup_rayhunter() { _at_syscmd "mkdir -p /data/rayhunter" - _adb_push config.toml.example /data/rayhunter/config.toml - _adb_push rayhunter-daemon /data/rayhunter/ + _adb_push config.toml.example /tmp/config.toml + _at_syscmd "mv /tmp/config.toml /data/rayhunter" + _adb_push rayhunter-daemon /tmp/rayhunter-daemon + _at_syscmd "mv /tmp/rayhunter-daemon /data/rayhunter" _adb_push scripts/rayhunter_daemon /tmp/rayhunter_daemon + _at_syscmd "mv /tmp/rayhunter_daemon /etc/init.d/rayhunter_daemon" _adb_push scripts/misc-daemon /tmp/misc-daemon - _at_syscmd "cp /tmp/rayhunter_daemon /etc/init.d/rayhunter_daemon" - _at_syscmd "cp /tmp/misc-daemon /etc/init.d/misc-daemon" + _at_syscmd "mv /tmp/misc-daemon /etc/init.d/misc-daemon" + _at_syscmd "chmod 755 /etc/init.d/rayhunter_daemon" _at_syscmd "chmod 755 /etc/init.d/misc-daemon" + echo -n "waiting for reboot..." _at_syscmd reboot From 9cd5ce33940fcd89d5f2f2706f437c48f968d62e Mon Sep 17 00:00:00 2001 From: Cooper Quintin Date: Mon, 18 Nov 2024 16:12:42 -0800 Subject: [PATCH 2/3] name binary rayhunter-daemon --- dist/install-common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/install-common.sh b/dist/install-common.sh index 5cc8363..a5f8d21 100755 --- a/dist/install-common.sh +++ b/dist/install-common.sh @@ -68,7 +68,7 @@ setup_rayhunter() { _adb_push config.toml.example /tmp/config.toml _at_syscmd "mv /tmp/config.toml /data/rayhunter" _adb_push rayhunter-daemon /tmp/rayhunter-daemon - _at_syscmd "mv /tmp/rayhunter-daemon /data/rayhunter" + _at_syscmd "mv /tmp/rayhunter-daemon /data/rayhunter-daemon" _adb_push scripts/rayhunter_daemon /tmp/rayhunter_daemon _at_syscmd "mv /tmp/rayhunter_daemon /etc/init.d/rayhunter_daemon" _adb_push scripts/misc-daemon /tmp/misc-daemon From 4856bb2b3dcace9a179815f1fa688f29c4756cf4 Mon Sep 17 00:00:00 2001 From: Cooper Quintin Date: Mon, 18 Nov 2024 16:14:52 -0800 Subject: [PATCH 3/3] Revert "name binary rayhunter-daemon" This reverts commit 9cd5ce33940fcd89d5f2f2706f437c48f968d62e. --- dist/install-common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/install-common.sh b/dist/install-common.sh index a5f8d21..5cc8363 100755 --- a/dist/install-common.sh +++ b/dist/install-common.sh @@ -68,7 +68,7 @@ setup_rayhunter() { _adb_push config.toml.example /tmp/config.toml _at_syscmd "mv /tmp/config.toml /data/rayhunter" _adb_push rayhunter-daemon /tmp/rayhunter-daemon - _at_syscmd "mv /tmp/rayhunter-daemon /data/rayhunter-daemon" + _at_syscmd "mv /tmp/rayhunter-daemon /data/rayhunter" _adb_push scripts/rayhunter_daemon /tmp/rayhunter_daemon _at_syscmd "mv /tmp/rayhunter_daemon /etc/init.d/rayhunter_daemon" _adb_push scripts/misc-daemon /tmp/misc-daemon