From e74eb9569c0b57a2b89c04922fa44455f134c5f8 Mon Sep 17 00:00:00 2001
From: remittor <remittor@gmail.com>
Date: Sat, 17 Sep 2022 13:36:31 +0300
Subject: [PATCH] Fix install and uninstall permanent SSH

---
 data/ssh_install.sh   | 18 +++++++++++++-----
 data/ssh_uninstall.sh |  5 +++--
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/data/ssh_install.sh b/data/ssh_install.sh
index b2e0823..0648c81 100644
--- a/data/ssh_install.sh
+++ b/data/ssh_install.sh
@@ -1,16 +1,24 @@
 #!/bin/sh
 
 if [ "$( grep 'ssh_patch.sh' /etc/crontabs/root )" != "" ]; then
-	sh /tmp/ssh_uninstall.sh
+	if [ -e "/tmp/ssh_uninstall.sh" ]; then
+		sh /tmp/ssh_uninstall.sh
+	fi
 fi
 
-mv -f /tmp/ssh_patch.sh /etc/crontabs/
-chmod +x /etc/crontabs/ssh_patch.sh
+if [ ! -d /etc/crontabs/patches/ ]; then
+	mkdir /etc/crontabs/patches/
+	chown root /etc/crontabs/patches/
+	chmod 0755 /etc/crontabs/patches/
+fi
+
+mv -f /tmp/ssh_patch.sh /etc/crontabs/patches/
+chmod +x /etc/crontabs/patches/ssh_patch.sh
 
 nvram set ssh_en=1
 nvram commit
 
-grep -v "/etc/crontabs/ssh_patch.sh" /etc/crontabs/root > /etc/crontabs/root.new; 
-echo "*/1 * * * * /etc/crontabs/ssh_patch.sh >/dev/null 2>&1" >> /etc/crontabs/root.new
+grep -v "/ssh_patch.sh" /etc/crontabs/root > /etc/crontabs/root.new
+echo "*/1 * * * * /etc/crontabs/patches/ssh_patch.sh >/dev/null 2>&1" >> /etc/crontabs/root.new
 mv /etc/crontabs/root.new /etc/crontabs/root
 /etc/init.d/cron restart
diff --git a/data/ssh_uninstall.sh b/data/ssh_uninstall.sh
index 3958c2c..6ecb8c6 100644
--- a/data/ssh_uninstall.sh
+++ b/data/ssh_uninstall.sh
@@ -1,8 +1,9 @@
 #!/bin/sh
 
-grep -v "/etc/crontabs/ssh_patch.sh" /etc/crontabs/root > /etc/crontabs/root.new; 
+grep -v "/ssh_patch.sh" /etc/crontabs/root > /etc/crontabs/root.new
 mv /etc/crontabs/root.new /etc/crontabs/root
 /etc/init.d/cron restart
 
-rm -f /etc/crontabs/ssh_patch.sh
+rm -f /etc/crontabs/patches/ssh_patch.sh
+rm -f /tmp/ssh_patch.log