From c7f5ec2f6c5782a45cb414fb7ee624175ec7979d Mon Sep 17 00:00:00 2001 From: Gaston Gonzalez Date: Mon, 17 Mar 2025 11:34:33 -0700 Subject: [PATCH 1/3] Fixes - Post R4 Build 15 fixes --- overlay/opt/emcomm-tools/bin/et-radio | 12 +++--------- overlay/opt/emcomm-tools/bin/et-uv-pro | 5 ++--- overlay/opt/emcomm-tools/bin/et-vr-n76 | 6 +++--- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/overlay/opt/emcomm-tools/bin/et-radio b/overlay/opt/emcomm-tools/bin/et-radio index f93119b..e049fcf 100755 --- a/overlay/opt/emcomm-tools/bin/et-radio +++ b/overlay/opt/emcomm-tools/bin/et-radio @@ -2,19 +2,14 @@ # # Author : Gaston Gonzalez # Date : 11 October 2024 -# Updated : 5 February 2025 +# Updated : 16 March 2025 # Purpose : A script for managaing plug-and-play radios -set -e +source /opt/emcomm-tools/bin/et-common ACTIVE_RADIO="${ET_HOME}/conf/radios.d/active-radio.json" NO_RADIO_ID="no-radio" -YELLOW="\033[1;33m" -GREEN="\033[0;32m" -RED="\033[0;31m" -NC="\033[0m" - options=() options+=("${NO_RADIO_ID}" "No radio") while IFS= read -r radio; do @@ -51,8 +46,7 @@ if [ $exit_status -eq 0 ]; then BLUETOOTH_TNC_CHECK=$(ps -ef | grep "[r]fcomm connect") if [[ $? -eq 0 ]]; then et-log "Killing running processes for Bluetooth TNC" - sudo /usr/bin/killall kissattach - sudo /usr/bin/killall rfcomm + sudo /opt/emcomm-tools/bin/et-kill-bt fi printf "%-20s %-10s %-10s\n" "Radio ID" "Vendor" "Model" diff --git a/overlay/opt/emcomm-tools/bin/et-uv-pro b/overlay/opt/emcomm-tools/bin/et-uv-pro index 57007df..0e24bf6 100755 --- a/overlay/opt/emcomm-tools/bin/et-uv-pro +++ b/overlay/opt/emcomm-tools/bin/et-uv-pro @@ -2,7 +2,7 @@ # # Author : Gaston Gonzalez # Date : 1 January 2025 -# Updated : 16 March 2025 +# Updated : 17 March 2025 # Purpose : Utility for accessing the Bluetooth TNC on the BTECH UV PRO. source /opt/emcomm-tools/bin/et-common @@ -236,8 +236,7 @@ EOF is_paired=$(bluetoothctl info ${MAC} | grep "Paired" | awk '{print $2}') if [ "${is_paired}" != "yes" ]; then - echo -e "${RED}" - et-log "${DEVICE_NAME} is not paired. Run: '$(basename $0) pair'" + echo -e "${RED}${DEVICE_NAME} is not paired. Run: '${WHITE}$(basename $0) pair${RED}'" echo -e "${NC}" exit 1 fi diff --git a/overlay/opt/emcomm-tools/bin/et-vr-n76 b/overlay/opt/emcomm-tools/bin/et-vr-n76 index 90b6bd8..429462c 100755 --- a/overlay/opt/emcomm-tools/bin/et-vr-n76 +++ b/overlay/opt/emcomm-tools/bin/et-vr-n76 @@ -1,8 +1,9 @@ #!/bin/bash # # Author : Gaston Gonzalez +# : Cliff Jones # Date : 1 January 2025 -# Updated : 16 March 2025 +# Updated : 17 March 2025 # Purpose : Utility for accessing the Bluetooth TNC on the BTECH UV PRO. source /opt/emcomm-tools/bin/et-common @@ -236,8 +237,7 @@ EOF is_paired=$(bluetoothctl info ${MAC} | grep "Paired" | awk '{print $2}') if [ "${is_paired}" != "yes" ]; then - echo -e "${RED}" - et-log "${DEVICE_NAME} is not paired. Run: '$(basename $0) pair'" + echo -e "${RED}${DEVICE_NAME} is not paired. Run: '${WHITE}$(basename $0) pair${RED}'" echo -e "${NC}" exit 1 fi From daa76ec8a829bab6ced0ce99cd0e5d8ca3a8731d Mon Sep 17 00:00:00 2001 From: Gaston Gonzalez Date: Mon, 17 Mar 2025 14:27:44 -0700 Subject: [PATCH 2/3] Removed the tty group from the exta groups in /etc/adduser.conf as it seems to break the Try it Now mode. This group is not technically needed. Users of the Panasonic CF-20 need to access the Try it Now option during the installation to change the display scale in order to use the installer --- overlay/etc/adduser.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overlay/etc/adduser.conf b/overlay/etc/adduser.conf index f86a478..b1fb999 100644 --- a/overlay/etc/adduser.conf +++ b/overlay/etc/adduser.conf @@ -79,7 +79,7 @@ USERS_GID=1981 # new users to other groups. # This is the list of groups that new non-system users will be added to # Default: -EXTRA_GROUPS="bluetooth dialout cdrom floppy audio video plugdev tty users" +EXTRA_GROUPS="bluetooth dialout cdrom floppy audio video plugdev users" # If ADD_EXTRA_GROUPS is set to something non-zero, the EXTRA_GROUPS # option above will be default behavior for adding new, non-system users From 5160acaa4b6a912bbd8a7e8dca194d46533f2bb6 Mon Sep 17 00:00:00 2001 From: Gaston Gonzalez Date: Tue, 18 Mar 2025 01:49:41 -0700 Subject: [PATCH 3/3] Revert "Removed the tty group from the exta groups in /etc/adduser.conf as it seems to break the Try it Now mode. This group is not technically needed. Users of the Panasonic CF-20 need to access the Try it Now option during the installation to change the display scale in order to use the installer" This reverts commit daa76ec8a829bab6ced0ce99cd0e5d8ca3a8731d. --- overlay/etc/adduser.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overlay/etc/adduser.conf b/overlay/etc/adduser.conf index b1fb999..f86a478 100644 --- a/overlay/etc/adduser.conf +++ b/overlay/etc/adduser.conf @@ -79,7 +79,7 @@ USERS_GID=1981 # new users to other groups. # This is the list of groups that new non-system users will be added to # Default: -EXTRA_GROUPS="bluetooth dialout cdrom floppy audio video plugdev users" +EXTRA_GROUPS="bluetooth dialout cdrom floppy audio video plugdev tty users" # If ADD_EXTRA_GROUPS is set to something non-zero, the EXTRA_GROUPS # option above will be default behavior for adding new, non-system users