From b8cbd56bb3bc5b556a8058447bf0446801e1934d Mon Sep 17 00:00:00 2001 From: Gaston Gonzalez Date: Tue, 18 Mar 2025 12:15:48 -0700 Subject: [PATCH] R4.18 - Introduced ET_EXPERT environment variable to enable more advanced installation behavior. Removed stale function from et-mode impacting the Winlink Packet mode. --- overlay/opt/emcomm-tools/bin/et-mode | 3 +-- scripts/install-wine.sh | 9 ++++++--- scripts/install.sh | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/overlay/opt/emcomm-tools/bin/et-mode b/overlay/opt/emcomm-tools/bin/et-mode index b7f84d0..aaf735b 100755 --- a/overlay/opt/emcomm-tools/bin/et-mode +++ b/overlay/opt/emcomm-tools/bin/et-mode @@ -2,7 +2,7 @@ # # Author : Gaston Gonzalez # Date : 6 November 2024 -# Updated : 15 March 2025 +# Updated : 18 March 2025 # Purpose : Configures the system for a specific mode of operation # Use a simple text file to save the state of the last mode selected @@ -236,7 +236,6 @@ if [ $exit_status -eq 0 ]; then min http://localhost:8080 ;; ${MODE_ID_WINLINK_PACKET}) - winlink_mode start_and_wait_for_service et-service-direwolf-simple start_and_wait_for_service et-service-winlink-packet min http://localhost:8080 diff --git a/scripts/install-wine.sh b/scripts/install-wine.sh index ab28515..2d0bb38 100755 --- a/scripts/install-wine.sh +++ b/scripts/install-wine.sh @@ -1,7 +1,7 @@ #!/bin/bash # Author : Gaston Gonzalez # Date : 20 January 2025 -# Updated : 1 February 2025 +# Updated : 18 March 2025 # Purpose : Install WINE to support VARA WIN32_DIR="${HOME}/.win32" @@ -27,5 +27,8 @@ apt install \ exe-thumbnailer \ -y -dialog --textbox wine.txt 15 74 -tput sgr 0 && clear +# Only show the directions for including WINE in the image to advanced users +if [[ ! -z "${ET_EXPERT}" ]]; then + dialog --textbox wine.txt 15 74 + tput sgr 0 && clear +fi diff --git a/scripts/install.sh b/scripts/install.sh index ece608b..8cef27f 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -2,7 +2,7 @@ # # Author : Gaston Gonzalez # Date : 16 March 2024 -# Updated : 28 February 2025 +# Updated : 18 March 2025 # Purpose : Main installer for EmComm Tools OS Community . ./env.sh @@ -57,6 +57,6 @@ exitIfNotRoot # Add user-specific data ./download-osm-maps.sh -./download-wikipedia.sh +[ ! -z "${ET_EXPERT}" ] && ./download-wikipedia.sh ./install-wine.sh