From f0ef1d36738919be78949694c9bb75a7a3a8c655 Mon Sep 17 00:00:00 2001
From: Dj Merrill <git@deej.net>
Date: Sun, 5 May 2024 12:39:20 -0400
Subject: [PATCH] Change to dr-freedata-001 branch of codec2, If hamlib 4.5.5
 is already installed, don't reinstall, Added comments in scripts and
 README.txt for config file location

---
 tools/Linux/README.txt                | 21 +++++++++++++++++++++
 tools/Linux/install-freedata-linux.sh | 25 +++++++++++++++++++++++--
 tools/Linux/run-freedata-linux.sh     |  3 +++
 3 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/tools/Linux/README.txt b/tools/Linux/README.txt
index 54be495d..9c7ae4d0 100644
--- a/tools/Linux/README.txt
+++ b/tools/Linux/README.txt
@@ -26,3 +26,24 @@ Open a terminal shell and run the following commands:
 cd ~/freedata
 
 bash run-freedata-linux.sh
+
+
+To view debugging output while running FreeDATA:
+
+Open a terminal shell.
+
+cd ~/freedata
+
+To view the GUI debug output:
+tail -f FreeDATA-client.log
+
+To view the server debug output:
+tail -f FreeDATA-server.log
+
+
+The run script looks for the config.ini file at: 
+$HOME/.config/FreeDATA/config.ini
+
+If it isn't found, we place a copy of config.ini.example into that location
+to give FreeDATA something to start with.  Changes to the defaults can be
+made within the FreeDATA GUI.
diff --git a/tools/Linux/install-freedata-linux.sh b/tools/Linux/install-freedata-linux.sh
index a4636455..e8ce2d05 100755
--- a/tools/Linux/install-freedata-linux.sh
+++ b/tools/Linux/install-freedata-linux.sh
@@ -15,7 +15,16 @@
 # FreeDATA-venv: Contains the Python virtual environment
 # FreeDATA-hamlib: Contains the hamlib libraries
 #
+# FreeDATA config file is stored in $HOME/.config/FreeDATA/config.ini
+# See the run-freedata-linux.sh for more details
+#
+#
 # Changelog:
+# 1.4:	05 May 2024
+#	Change to "dr-freedata-001" branch of codec2 for develop mode
+#	Added comments in scripts and README.txt for config file location
+#	If hamlib 4.5.5 is already in FreeDATA-hamlib, don't reinstall
+#
 # 1.3:	02 May 2024
 #	Remove dependency on distro supplied hamlib library which can be old
 #	Download and install hamlib 4.5.5 into ./FreeDATA-hamlib
@@ -128,7 +137,7 @@ else
 fi
 
 echo "*************************************************************************"
-echo "Installing hamlib into FreeDATA-hamlib"
+echo "Checking for hamlib 4.5.5 in FreeDATA-hamlib"
 echo "*************************************************************************"
 
 if [ -d "FreeDATA-hamlib.old" ];
@@ -138,11 +147,23 @@ fi
 
 if [ -d "FreeDATA-hamlib" ];
 then
-	mv FreeDATA-hamlib FreeDATA-hamlib.old
+	if [ -f "./FreeDATA-hamlib/bin/rigctl" ];
+	then
+		checkhamlibver=`./FreeDATA-hamlib/bin/rigctl --version | cut -f3 -d" "`
+		if [ "$checkhamlibver" != "4.5.5" ];
+		then
+			mv FreeDATA-hamlib FreeDATA-hamlib.old
+		else
+			echo "Hamlib 4.5.5 found, no installation needed."
+		fi
+	else
+		mv FreeDATA-hamlib FreeDATA-hamlib.old
+	fi
 fi
 
 if [ ! -d "FreeDATA-hamlib" ];
 then
+	echo "Installing hamlib 4.5.5 into FreeDATA-hamlib"
 	curdir=`pwd`
 	wget https://github.com/Hamlib/Hamlib/releases/download/4.5.5/hamlib-4.5.5.tar.gz
 	if [ -f "hamlib-4.5.5.tar.gz" ];
diff --git a/tools/Linux/run-freedata-linux.sh b/tools/Linux/run-freedata-linux.sh
index 805bd70f..d4237704 100755
--- a/tools/Linux/run-freedata-linux.sh
+++ b/tools/Linux/run-freedata-linux.sh
@@ -10,10 +10,13 @@
 # Two log files are created in this directory:
 # FreeDATA-server.log: debug output from the server process
 # FreeDATA-client.log: debug output from the GUI front end
+# To view live, "tail -f FreeDATA-server.log" or "tail -f FreeDATA-client.log"
 #
 # We expect the config.ini file to be at $HOME/.config/FreeDATA/config.ini
 # If it isn't found, we copy config.ini.example there
 #
+# 1.4:  05 May 2024
+#	Added comments on how to view log outputs in realtime
 # 1.3:  02 May 2024
 #	Add support for hamlib installed by FreeDATA install script
 # 1.2:  30 Apr 2024