diff --git a/overlay/opt/emcomm-tools/bin/et-aircraft b/overlay/opt/emcomm-tools/bin/et-aircraft index ad81d2e..c6a0a93 100755 --- a/overlay/opt/emcomm-tools/bin/et-aircraft +++ b/overlay/opt/emcomm-tools/bin/et-aircraft @@ -2,7 +2,7 @@ # # Author : Gaston Gonzalez # Date : 4 June 2025 -# Update : 8 June 2025 +# Update : 8 July 2025 # Purpose : Wrapper script around ADS-B integration # # Preconditions: @@ -10,13 +10,7 @@ # # Postconditions: # 1. dump1099 systemd service is launched -# 2. Web browser is launched with dump1090 map - -# TODO: Increse size of aircraft -# TODO: Additional info -# TODO: Research why RTL-SDR v4 does not work -# TODO: Test RTL-SDR v3 -# TODO: Use ETC offline map engine +# 2. et-aircraft-app launched source /opt/emcomm-tools/bin/et-common @@ -41,5 +35,5 @@ fi systemctl --user restart et-service-dump1090 if [[ $? -eq 0 ]]; then start_and_wait_for_service et-service-dump1090 - min http://localhost:1090 2>/dev/null + et-aircraft-app fi diff --git a/scripts/install-et-aircraft.sh b/scripts/install-et-aircraft.sh new file mode 100755 index 0000000..806bd1b --- /dev/null +++ b/scripts/install-et-aircraft.sh @@ -0,0 +1,27 @@ +#!/bin/bash +# Author : Gaston Gonzalez +# Date : 9 July 2025 +# Purpose : Install et-aircraft-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 + +APP=et-aircraft-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/et-aircraft-app/releases/download/${VERSION}/${DOWNLOAD_FILE}" + + et-log "Downloading ${APP}: ${URL}" + curl -s -L -o ${DOWNLOAD_FILE} --fail ${URL} + + 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 879ddde..cca1524 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -2,7 +2,7 @@ # # Author : Gaston Gonzalez # Date : 16 March 2024 -# Updated : 6 July 2025 +# Updated : 9 July 2025 # Purpose : Main installer for EmComm Tools Community (ETC) . ./env.sh @@ -74,5 +74,8 @@ exitIfNotRoot ./install-sdr-tools.sh ./install-dump1090.sh -# Install ETC application maps +# Install ETC custom maps ./download-et-maps.sh + +# Install ETC applications +./install-et-aircraft.sh diff --git a/tests/test-et-aircraft.sh b/tests/test-et-aircraft.sh new file mode 100755 index 0000000..936fe10 --- /dev/null +++ b/tests/test-et-aircraft.sh @@ -0,0 +1,7 @@ +#!/bin/bash +# Author : Gaston Gonzalez +# Date : 9 July 2025 +# Purpose : Test et-aircraft installation + +OUT=$(which et-aircraft && which et-aircraft-app) +exit $?