mirror of
https://github.com/thetechprepper/emcomm-tools-os-community.git
synced 2026-09-17 15:41:44 -04:00
Merge pull request #111 from thetechprepper/feature/et-user-app
Feature/et user app
This commit is contained in:
thetechprepper
+8
-3
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
+16
@@ -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
|
||||
@@ -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
|
||||
@@ -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]
|
||||
|
||||
@@ -7,14 +7,11 @@
|
||||
<div>
|
||||
<p>et-mode supports zero-configuration when running your favorite radio applications and modes.</p>
|
||||
|
||||
<ul>
|
||||
<li>Open a terminal.</li>
|
||||
<li>Run "et-mode" and select an application</li>
|
||||
</ul>
|
||||
<p>Open a terminal, run "et-mode" and select an application.</p>
|
||||
|
||||
<p>No configuration. Just operate!</p>
|
||||
|
||||
<p>For JS8Call or fldigi, just click the desktop icon.</p>
|
||||
<p>For JS8Call or fldigi, just click the desktop icons.</p>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
@@ -7,11 +7,7 @@
|
||||
<div>
|
||||
<p>et-radio supports plug-and-play configuration for several radios.</p>
|
||||
|
||||
<ul>
|
||||
<li>Open a terminal.</li>
|
||||
<li>Run "et-radio" and select your radio.</li>
|
||||
<li>Plug in your radio.</li>
|
||||
</ul>
|
||||
<p>Open a terminal, run "et-radio", then plug in your radio.</p>
|
||||
|
||||
<p>No configuration needed for any radio-based application!</p>
|
||||
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
<div class="header"><h1 class="slidetitle">Global User Configuration</h1></div>
|
||||
|
||||
<div class="main">
|
||||
|
||||
<div class="text">
|
||||
|
||||
<div>
|
||||
<p>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.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<img class="screenshot" src="screenshots/et-user.png" />
|
||||
|
||||
</div>
|
||||
@@ -29,6 +29,7 @@
|
||||
<div id="wrapper">
|
||||
<div id="slideshow">
|
||||
<div><a href="welcome.html"></a></div>
|
||||
<div><a href="et-user.html"></a></div>
|
||||
<div><a href="et-radio.html"></a></div>
|
||||
<div><a href="et-mode.html"></a></div>
|
||||
<div><a href="et-predict.html"></a></div>
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 28 KiB |
@@ -1,4 +1,4 @@
|
||||
<div class="header"><h1 class="slidetitle">Welcome to EmComm Tools</h1></div>
|
||||
<div class="header"><h1 class="slidetitle">Welcome to EmComm Tools R7</h1></div>
|
||||
|
||||
<div class="main wide">
|
||||
|
||||
|
||||
Executable
+54
@@ -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
|
||||
@@ -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
|
||||
|
||||
@@ -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}
|
||||
|
||||
+4
-1
@@ -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
|
||||
|
||||
Executable
+7
@@ -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 $?
|
||||
Reference in New Issue
Block a user