diff --git a/REGRESSION.md b/REGRESSION.md index d6bcced..468660b 100644 --- a/REGRESSION.md +++ b/REGRESSION.md @@ -1,10 +1,15 @@ -# ETC Regression Tests +# EmComm Tools Regression Tests -- **Build**: ETC R7 Build 12 -- **Date**: 16 July 2026 +- **Build**: ETC R7 Build 15 +- **Date**: 8 August 2026 + +## First Login + +* [ ] User configuration presented ## Desktop/Launcher Icons +* [ ] EmComm Tools icon (et-user-app) * [ ] JS8Call icon * [ ] fldigi icon * [ ] et-predict diff --git a/TODO.md b/TODO.md index 7d4be29..4f9c41b 100644 --- a/TODO.md +++ b/TODO.md @@ -1,7 +1,9 @@ # To-Do +* [ ] Add NomadNet +* [ ] Update MeshChat 2.4.0 fork +* [ ] Upgrade RNS to version 1.4.2 * [ ] Add Reticulum - * [ ] Add solution for handling first start * [ ] et-user-backup * [ ] ~/.reticulum/storage/identities * [ ] ~/.nomadnetwork/storage @@ -16,4 +18,3 @@ * Add radio support * [ ] TX500MP + LINK500MP * [ ] IC-7300 MkII -* [ ] Thunderbird (Optional) diff --git a/overlay/etc/xdg/autostart/et-user-first-login.desktop b/overlay/etc/xdg/autostart/et-user-first-login.desktop new file mode 100644 index 0000000..02bd735 --- /dev/null +++ b/overlay/etc/xdg/autostart/et-user-first-login.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Name=EmComm Tools User Configuration +Comment=EmComm Tools user configuration +Exec=/opt/emcomm-tools/bin/et-user-first-login +Terminal=false +NoDisplay=true +X-GNOME-Autostart-enabled=true diff --git a/overlay/opt/emcomm-tools/bin/et-user-first-login b/overlay/opt/emcomm-tools/bin/et-user-first-login new file mode 100755 index 0000000..b92dd64 --- /dev/null +++ b/overlay/opt/emcomm-tools/bin/et-user-first-login @@ -0,0 +1,16 @@ +#!/bin/bash +# +# Author : Gaston Gonzalez +# Date : 8 Agust 2026 +# Purpose: Wrapper for running et-user-app on first login. + +FIRST_LOGIN_FILE="${HOME}/.config/emcomm-tools/first-login-complete" + +if [[ ! -e "${FIRST_LOGIN_FILE}" ]]; then + + GDK_BACKEND=x11 /opt/et-user-app/bin/et-user-app + + if [[ $? -eq 0 ]]; then + touch "${FIRST_LOGIN_FILE}" + fi +fi diff --git a/overlay/usr/share/applications/et-user.desktop b/overlay/usr/share/applications/et-user.desktop new file mode 100644 index 0000000..26ecce8 --- /dev/null +++ b/overlay/usr/share/applications/et-user.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Version=1.0 +Name=et-user +Comment=EmComm Tools user configuration +Exec=/opt/et-user-app/bin/et-user-app +Icon=emcomm-tools-icon-black-192 +Terminal=false +X-MultipleArgs=false +Type=Application +Categories=HamRadio; +StartupNotify=true diff --git a/overlay/usr/share/glib-2.0/schemas/90_ubuntu-settings.gschema.override b/overlay/usr/share/glib-2.0/schemas/90_ubuntu-settings.gschema.override index 5306502..43fdd31 100644 --- a/overlay/usr/share/glib-2.0/schemas/90_ubuntu-settings.gschema.override +++ b/overlay/usr/share/glib-2.0/schemas/90_ubuntu-settings.gschema.override @@ -12,7 +12,7 @@ show-desktop-icons = false picture-uri = 'file:///usr/share/backgrounds/emcomm-tools-wallpaper.png' [org.gnome.shell] -favorite-apps = ['emcomm-tools.desktop', 'js8call.desktop', 'fldigi.desktop', 'et-predict-app.desktop', 'et-aircraft.desktop', 'org.gnome.Terminal.desktop', 'navit.desktop', 'min.desktop', 'org.gnome.Nautilus.desktop'] +favorite-apps = ['et-user.desktop', 'js8call.desktop', 'fldigi.desktop', 'et-predict-app.desktop', 'et-aircraft.desktop', 'org.gnome.Terminal.desktop', 'navit.desktop', 'min.desktop', 'org.gnome.Nautilus.desktop'] last-selected-power-profile = 'performance' [org.gnome.system.location] diff --git a/overlay/usr/share/ubiquity-slideshow/slides/et-mode.html b/overlay/usr/share/ubiquity-slideshow/slides/et-mode.html index 80adcde..bc1ffdd 100644 --- a/overlay/usr/share/ubiquity-slideshow/slides/et-mode.html +++ b/overlay/usr/share/ubiquity-slideshow/slides/et-mode.html @@ -7,14 +7,11 @@

et-mode supports zero-configuration when running your favorite radio applications and modes.

- +

Open a terminal, run "et-mode" and select an application.

No configuration. Just operate!

-

For JS8Call or fldigi, just click the desktop icon.

+

For JS8Call or fldigi, just click the desktop icons.

diff --git a/overlay/usr/share/ubiquity-slideshow/slides/et-radio.html b/overlay/usr/share/ubiquity-slideshow/slides/et-radio.html index c867d3f..b514f4d 100644 --- a/overlay/usr/share/ubiquity-slideshow/slides/et-radio.html +++ b/overlay/usr/share/ubiquity-slideshow/slides/et-radio.html @@ -7,11 +7,7 @@

et-radio supports plug-and-play configuration for several radios.

- +

Open a terminal, run "et-radio", then plug in your radio.

No configuration needed for any radio-based application!

diff --git a/overlay/usr/share/ubiquity-slideshow/slides/et-user.html b/overlay/usr/share/ubiquity-slideshow/slides/et-user.html new file mode 100644 index 0000000..6c72645 --- /dev/null +++ b/overlay/usr/share/ubiquity-slideshow/slides/et-user.html @@ -0,0 +1,16 @@ +

Global User Configuration

+ +
+ +
+ +
+

EmComm Tools User Configuration allows you to specify your operator details once. Supported applications automatically use this information to provide a consistent, zero-configuration experience. +

+
+ +
+ + + +
diff --git a/overlay/usr/share/ubiquity-slideshow/slides/index.html b/overlay/usr/share/ubiquity-slideshow/slides/index.html index a176b2a..3ae649f 100644 --- a/overlay/usr/share/ubiquity-slideshow/slides/index.html +++ b/overlay/usr/share/ubiquity-slideshow/slides/index.html @@ -29,6 +29,7 @@
+
diff --git a/overlay/usr/share/ubiquity-slideshow/slides/screenshots/et-user.png b/overlay/usr/share/ubiquity-slideshow/slides/screenshots/et-user.png new file mode 100644 index 0000000..0232725 Binary files /dev/null and b/overlay/usr/share/ubiquity-slideshow/slides/screenshots/et-user.png differ diff --git a/overlay/usr/share/ubiquity-slideshow/slides/welcome.html b/overlay/usr/share/ubiquity-slideshow/slides/welcome.html index f0287ec..653876c 100644 --- a/overlay/usr/share/ubiquity-slideshow/slides/welcome.html +++ b/overlay/usr/share/ubiquity-slideshow/slides/welcome.html @@ -1,4 +1,4 @@ -

Welcome to EmComm Tools

+

Welcome to EmComm Tools R7

diff --git a/scripts/install-et-user-app.sh b/scripts/install-et-user-app.sh new file mode 100755 index 0000000..9e492d7 --- /dev/null +++ b/scripts/install-et-user-app.sh @@ -0,0 +1,54 @@ +#!/bin/bash +# Author : Gaston Gonzalez +# Date : 8 August 2026 +# Updated : 9 August 2026 +# Purpose : Builds and installs et-user-app +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 +. ../overlay/opt/emcomm-tools/bin/et-common + +APP="et-user-app" +VERSION="1.0.2" +APP_AND_VERSION="${APP}-${VERSION}" +GIT_TAG="${VERSION}" +GIT_URL="https://github.com/thetechprepper/et-user-app.git" +GIT_WORKSPACE="${APP}" +INSTALL_DIR="/opt/${APP_AND_VERSION}" +BIN_DIR="${INSTALL_DIR}/bin" +LINK_PATH="/opt/${APP}" + +et-log "Installing ${APP} ${VERSION}" + +et-log "Installing build dependencies..." +apt install \ + libgtk-3-dev \ + libgtk-3-doc \ + libjson-glib-dev \ + -y + +CWD_DIR=`pwd` + +cd ${ET_SRC_DIR} +[[ ! -e ${GIT_WORKSPACE} ]] && git clone ${GIT_URL} ${GIT_WORKSPACE} + +cd ${GIT_WORKSPACE} +git checkout ${GIT_TAG} + +make + +mkdir -v -p "${BIN_DIR}" +cp ${APP} ${BIN_DIR} + +[[ -e ${LINK_PATH} ]] && rm ${LINK_PATH} +ln -v -s ${INSTALL_DIR} ${LINK_PATH} + +stow -v -d /opt ${APP} -t /usr/local + +cd ${CWD_DIR} + +cp -v ../overlay/usr/share/applications/et-user.desktop /usr/share/applications +cp -v ../overlay/etc/xdg/autostart/et-user-first-login.desktop \ + /etc/xdg/autostart diff --git a/scripts/install-fldigi.sh b/scripts/install-fldigi.sh index 6c4e4ce..44b756a 100755 --- a/scripts/install-fldigi.sh +++ b/scripts/install-fldigi.sh @@ -42,7 +42,7 @@ ln -v -s ${INSTALL_DIR} ${LINK_PATH} stow -v -d /opt ${APP} -t /usr/local -cd ${CWD} +cd ${CWD_DIR} # Use wrapper script as launcher executable sed -i 's|^Exec.*|Exec=/opt/emcomm-tools/bin/et-fldigi start|' /opt/fldigi/share/applications/fldigi.desktop diff --git a/scripts/install-flmsg.sh b/scripts/install-flmsg.sh index f139a61..608dbf8 100755 --- a/scripts/install-flmsg.sh +++ b/scripts/install-flmsg.sh @@ -50,4 +50,4 @@ cp -v /opt/flmsg/share/applications/flmsg.desktop /usr/share/applications/flmsg. stow -v -d /opt ${APP} -t /usr/local -cd ${CWD} +cd ${CWD_DIR} diff --git a/scripts/install.sh b/scripts/install.sh index 95a0841..a2ce0f4 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -2,7 +2,7 @@ # # Author : Gaston Gonzalez # Date : 16 March 2024 -# Updated : 16 July 2026 +# Updated : 9 August 2026 # Purpose : Main installer for EmComm Tools Community (ETC) . ./env.sh @@ -130,3 +130,6 @@ exitIfNotRoot # Email ./install-thunderbird.sh + +# EmComm Tools PnP GUI apps +./install-et-user-app.sh diff --git a/tests/test-et-user-app.sh b/tests/test-et-user-app.sh new file mode 100755 index 0000000..1c41277 --- /dev/null +++ b/tests/test-et-user-app.sh @@ -0,0 +1,7 @@ +#!/bin/bash +# Author : Gaston Gonzalez +# Date : 8 August 2026 +# Purpose : Test et-user-app installation + +OUT=$(which et-user-app) +exit $?