From fc6aa41e9fc4157853ec7869ccb76ec39a8c8b5f Mon Sep 17 00:00:00 2001
From: Gaston Gonzalez <info@thetechprepper.com>
Date: Mon, 3 Feb 2025 17:28:54 -0700
Subject: [PATCH] QtTermTCP - Upgraded to QtTermTCP 0.0.0.58. The binary is
 newer than the source code build. This version is needed to support VARA BPQ
 connections. VARA Terminal under ETC is not performing well.

---
 scripts/install-qttermtcp-from-source.sh | 78 ++++++++++++++++++++++++
 scripts/install-qttermtcp.sh             | 32 ++--------
 2 files changed, 83 insertions(+), 27 deletions(-)
 create mode 100755 scripts/install-qttermtcp-from-source.sh

diff --git a/scripts/install-qttermtcp-from-source.sh b/scripts/install-qttermtcp-from-source.sh
new file mode 100755
index 0000000..a6558e6
--- /dev/null
+++ b/scripts/install-qttermtcp-from-source.sh
@@ -0,0 +1,78 @@
+#!/bin/bash
+# Author  : Gaston Gonzalez
+# Date    : 17 December 2024
+# Updated : 28 January 2025
+# Purpose : Install QtTermTCP
+set -e
+trap 'last_command=$current_command; current_command=$BASH_COMMAND' DEBUG
+trap 'et-log "\"${last_command}\" command failed with exit code $?."' ERR
+
+. ./env.sh
+
+APP=qttermtcp
+VERSION=latest
+DOWNLOAD_FILE=QtTermSource.zip
+BIN_FILE=QtTermTCP
+INSTALL_DIR="/opt/${APP}-${VERSION}"
+INSTALL_BIN_DIR="${INSTALL_DIR}/bin"
+LINK_PATH="/opt/${APP}"
+
+et-log "Enabling i386 architecture support.."
+dpkg --add-architecture i386
+apt update
+
+et-log "Installing QtTermTCP 32-bit build dependencies..."
+apt install \
+  qtbase5-dev:i386 \
+  qtbase5-dev-tools:i386 \
+  qt5-qmake:i386 \
+  qtchooser:i386 \
+  qtmultimedia5-dev:i386 \
+  libqt5serialport5-dev:i386 \
+  libfftw3-dev:i386 \
+  qttools5-dev-tools:i386 \
+  -y
+
+et-log "Installing QtTermTCP build dependencies..."
+apt install \
+  qtbase5-dev \
+  qtbase5-dev-tools \
+  qt5-qmake \
+  qtchooser \
+  qtmultimedia5-dev \
+  libqt5serialport5-dev \
+  libfftw3-dev \
+  qttools5-dev-tools \
+  -y
+
+if [ ! -e ${ET_DIST_DIR}/${DOWNLOAD_FILE} ]; then
+
+  URL=http://www.cantab.net/users/john.wiseman/Downloads/${DOWNLOAD_FILE}
+
+  et-log "Downloading QtTermTCP: ${URL}"
+  curl -s -L -o ${DOWNLOAD_FILE} --fail ${URL}
+
+  mv -v ${DOWNLOAD_FILE} ${ET_DIST_DIR}
+fi
+
+CWD_DIR=`pwd`
+
+# Only build once
+if [ ! -e "${ET_SRC_DIR}/${APP}/${BIN_FILE}" ]; then
+  cd ${ET_SRC_DIR}
+  mkdir -v ${APP} && cd ${APP}
+  unzip ${ET_DIST_DIR}/${DOWNLOAD_FILE}
+
+  et-log "Building QtTermTCP.."
+  qmake && make
+fi
+
+[ ! -e ${INSTALL_BIN_DIR} ] && mkdir -v -p ${INSTALL_BIN_DIR}
+cp -v "${ET_SRC_DIR}/${APP}/${BIN_FILE}" ${INSTALL_BIN_DIR}
+
+[ -e ${LINK_PATH} ] && rm ${LINK_PATH}
+ln -s ${INSTALL_DIR} ${LINK_PATH}
+
+stow -v -d /opt ${APP} -t /usr/local
+
+cd $CWD_DIR
diff --git a/scripts/install-qttermtcp.sh b/scripts/install-qttermtcp.sh
index a6558e6..25ddeb7 100755
--- a/scripts/install-qttermtcp.sh
+++ b/scripts/install-qttermtcp.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 # Author  : Gaston Gonzalez
-# Date    : 17 December 2024
-# Updated : 28 January 2025
+# Date    : 3 February 2025
 # Purpose : Install QtTermTCP
 set -e
 trap 'last_command=$current_command; current_command=$BASH_COMMAND' DEBUG
@@ -11,7 +10,7 @@ trap 'et-log "\"${last_command}\" command failed with exit code $?."' ERR
 
 APP=qttermtcp
 VERSION=latest
-DOWNLOAD_FILE=QtTermSource.zip
+DOWNLOAD_FILE=QtTermTCP
 BIN_FILE=QtTermTCP
 INSTALL_DIR="/opt/${APP}-${VERSION}"
 INSTALL_BIN_DIR="${INSTALL_DIR}/bin"
@@ -21,7 +20,7 @@ et-log "Enabling i386 architecture support.."
 dpkg --add-architecture i386
 apt update
 
-et-log "Installing QtTermTCP 32-bit build dependencies..."
+et-log "Installing QtTermTCP 32-bit build and runtime dependencies..."
 apt install \
   qtbase5-dev:i386 \
   qtbase5-dev-tools:i386 \
@@ -33,18 +32,6 @@ apt install \
   qttools5-dev-tools:i386 \
   -y
 
-et-log "Installing QtTermTCP build dependencies..."
-apt install \
-  qtbase5-dev \
-  qtbase5-dev-tools \
-  qt5-qmake \
-  qtchooser \
-  qtmultimedia5-dev \
-  libqt5serialport5-dev \
-  libfftw3-dev \
-  qttools5-dev-tools \
-  -y
-
 if [ ! -e ${ET_DIST_DIR}/${DOWNLOAD_FILE} ]; then
 
   URL=http://www.cantab.net/users/john.wiseman/Downloads/${DOWNLOAD_FILE}
@@ -52,23 +39,14 @@ if [ ! -e ${ET_DIST_DIR}/${DOWNLOAD_FILE} ]; then
   et-log "Downloading QtTermTCP: ${URL}"
   curl -s -L -o ${DOWNLOAD_FILE} --fail ${URL}
 
+  chmod 755 ${DOWNLOAD_FILE}
   mv -v ${DOWNLOAD_FILE} ${ET_DIST_DIR}
 fi
 
 CWD_DIR=`pwd`
 
-# Only build once
-if [ ! -e "${ET_SRC_DIR}/${APP}/${BIN_FILE}" ]; then
-  cd ${ET_SRC_DIR}
-  mkdir -v ${APP} && cd ${APP}
-  unzip ${ET_DIST_DIR}/${DOWNLOAD_FILE}
-
-  et-log "Building QtTermTCP.."
-  qmake && make
-fi
-
 [ ! -e ${INSTALL_BIN_DIR} ] && mkdir -v -p ${INSTALL_BIN_DIR}
-cp -v "${ET_SRC_DIR}/${APP}/${BIN_FILE}" ${INSTALL_BIN_DIR}
+cp -v "${ET_DIST_DIR}/${DOWNLOAD_FILE}" ${INSTALL_BIN_DIR}
 
 [ -e ${LINK_PATH} ] && rm ${LINK_PATH}
 ln -s ${INSTALL_DIR} ${LINK_PATH}