From 82cb30329cad931d3c92ecf9ed74b0bbfda263a1 Mon Sep 17 00:00:00 2001
From: Mark McIntyre <mark.jm.mcintyre@cesmail.net>
Date: Thu, 1 Jul 2021 18:30:21 +0100
Subject: [PATCH 1/2] improve gatherlogs

---
 gatherLogs.sh | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/gatherLogs.sh b/gatherLogs.sh
index 73f3e86..f510b12 100755
--- a/gatherLogs.sh
+++ b/gatherLogs.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 cd ~/RMS_data/logs
+mkdir logtmp
+cd logtmp
 
 #
 # Script to gather the logfiles and upload them for debugging & analysis
@@ -8,14 +10,17 @@ source /home/pi/source/ukmon-pitools/ukmon.ini
 sudo cp /var/log/kern.log .
 sudo chown pi:pi kern.log
 cp /var/log/messages ./messages.log
-cp /home/pi/source/RMS/.config ${LOCATION}.config
-cp /home/pi/source/RMS/platepar_cmn2010.cal ${LOCATION}.cal
+cp /home/pi/source/RMS/.config ./${LOCATION}.config
+cp /home/pi/source/RMS/platepar_cmn2010.cal ./${LOCATION}.cal
+crontab -l > ./crontab.txt
+find  .. -maxdepth 1 -name "*.log*" -type f -mtime -5 -exec cp {} . \;
 ZIPFILE=/tmp/${LOCATION}_logs.tgz
-tar cvzf $ZIPFILE *.log* ${LOCATION}.config ${LOCATION}.cal
+tar cvzf $ZIPFILE *.log* ${LOCATION}.config ${LOCATION}.cal crontab.txt
 sftp -i $UKMONKEY -q logupload@$UKMONHELPER << EOF
 cd logs
 progress
 put $ZIPFILE 
 exit
 EOF
-rm kern.log messages.log $ZIPFILE ${LOCATION}.config ${LOCATION}.cal
+cd ..
+rm -Rf logtmp

From efe64017bf8e36cfdce4219371094b9727f6362c Mon Sep 17 00:00:00 2001
From: Mark McIntyre <mark.jm.mcintyre@cesmail.net>
Date: Thu, 1 Jul 2021 18:30:36 +0100
Subject: [PATCH 2/2] further small improvements to gatherlogs

---
 gatherLogs.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gatherLogs.sh b/gatherLogs.sh
index f510b12..142d9ec 100755
--- a/gatherLogs.sh
+++ b/gatherLogs.sh
@@ -12,10 +12,12 @@ sudo chown pi:pi kern.log
 cp /var/log/messages ./messages.log
 cp /home/pi/source/RMS/.config ./${LOCATION}.config
 cp /home/pi/source/RMS/platepar_cmn2010.cal ./${LOCATION}.cal
+cp /home/pi/source/ukmon-pitools/*.key .
+cp /home/pi/source/ukmon-pitools/*.ini .
 crontab -l > ./crontab.txt
 find  .. -maxdepth 1 -name "*.log*" -type f -mtime -5 -exec cp {} . \;
 ZIPFILE=/tmp/${LOCATION}_logs.tgz
-tar cvzf $ZIPFILE *.log* ${LOCATION}.config ${LOCATION}.cal crontab.txt
+tar cvzf $ZIPFILE *.log* ${LOCATION}.config ${LOCATION}.cal crontab.txt *.key *.ini
 sftp -i $UKMONKEY -q logupload@$UKMONHELPER << EOF
 cd logs
 progress