From 81870f72750e36043b8c5089f3bb68f81dcdda35 Mon Sep 17 00:00:00 2001 From: thetechprepper Date: Thu, 4 Sep 2025 06:07:41 -0700 Subject: [PATCH] et-predict - Added et-predict to the installer. Note: the current application is just a skeleton. There is only a base map with logic yet --- .../90_ubuntu-settings.gschema.override | 2 +- scripts/install-et-predict.sh | 26 +++++++++++++++++++ scripts/install.sh | 3 ++- tests/test-et-predict.sh | 7 +++++ 4 files changed, 36 insertions(+), 2 deletions(-) create mode 100755 scripts/install-et-predict.sh create mode 100755 tests/test-et-predict.sh 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 13f00af..66fbff9 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', 'et-aircraft.desktop', 'org.gnome.Terminal.desktop', 'navit.desktop', 'min.desktop', 'org.gnome.Nautilus.desktop'] +favorite-apps = ['emcomm-tools.desktop', 'js8call.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-predict.sh b/scripts/install-et-predict.sh new file mode 100755 index 0000000..61827b9 --- /dev/null +++ b/scripts/install-et-predict.sh @@ -0,0 +1,26 @@ +#!/bin/bash +# Author : Gaston Gonzalez +# Date : 4 September 2025 +# Purpose : Install et-predict-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-predict-app +VERSION=1.0.0 +DOWNLOAD_FILE="${APP}_${VERSION}_amd64.deb" + +et-log "Installing ${APP} ${VERSION}..." + +if [[ ! -e ${ET_DIST_DIR}/${DOWNLOAD_FILE} ]]; then + + URL="https://github.com/thetechprepper/${APP}/releases/download/${VERSION}/${DOWNLOAD_FILE}" + + download_with_retries ${URL} ${DOWNLOAD_FILE} + mv ${DOWNLOAD_FILE} ${ET_DIST_DIR} +fi + +DEBIAN_FRONTEND=noninteractive dpkg -i "${ET_DIST_DIR}/${DOWNLOAD_FILE}" diff --git a/scripts/install.sh b/scripts/install.sh index 655e658..fedd120 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -2,7 +2,7 @@ # # Author : Gaston Gonzalez # Date : 16 March 2024 -# Updated : 16 August 2025 +# Updated : 4 September 2025 # Purpose : Main installer for EmComm Tools Community (ETC) . ./env.sh @@ -87,3 +87,4 @@ exitIfNotRoot # Install prediction tools ./install-voacap.sh +./install-et-predict.sh diff --git a/tests/test-et-predict.sh b/tests/test-et-predict.sh new file mode 100755 index 0000000..c4a760c --- /dev/null +++ b/tests/test-et-predict.sh @@ -0,0 +1,7 @@ +#!/bin/bash +# Author : Gaston Gonzalez +# Date : 4 September 2025 +# Purpose : Test et-predict installation + +OUT=$(which et-predict-app) +exit $?