From 6fe10e1e9defdd729cd480b11a38990cae6a02c2 Mon Sep 17 00:00:00 2001
From: thetechprepper <info@thetechprepper.com>
Date: Sat, 8 Aug 2026 21:17:19 -0700
Subject: [PATCH] Added et-user-app to installer and desktop

---
 REGRESSION.md                                         |  5 +++--
 overlay/usr/share/applications/et-user.desktop        | 11 +++++++++++
 .../schemas/90_ubuntu-settings.gschema.override       |  2 +-
 scripts/install-et-user-app.sh                        |  5 ++++-
 scripts/install-fldigi.sh                             |  2 +-
 scripts/install-flmsg.sh                              |  2 +-
 6 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 overlay/usr/share/applications/et-user.desktop

diff --git a/REGRESSION.md b/REGRESSION.md
index d6bcced..340d8ea 100644
--- a/REGRESSION.md
+++ b/REGRESSION.md
@@ -1,7 +1,7 @@
 # ETC Regression Tests 
 
-- **Build**: ETC R7 Build 12
-- **Date**: 16 July 2026
+- **Build**: ETC R7 Build 15
+- **Date**: 8 August 2026
 
 ## Desktop/Launcher Icons
 
@@ -12,6 +12,7 @@
 * [ ] Terminal
 * [ ] Navit
 * [ ] Min web browser
+* [ ] et-user-app
 
 ## et-predict
 
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/scripts/install-et-user-app.sh b/scripts/install-et-user-app.sh
index 93635d5..232ab14 100755
--- a/scripts/install-et-user-app.sh
+++ b/scripts/install-et-user-app.sh
@@ -7,6 +7,7 @@ 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.0"
@@ -45,4 +46,6 @@ ln -v -s ${INSTALL_DIR} ${LINK_PATH}
 
 stow -v -d /opt ${APP} -t /usr/local
 
-cd ${CWD}
+cd ${CWD_DIR}
+
+cp -v ../overlay/usr/share/applications/et-user.desktop /usr/share/applications
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}