mirror
/
adsb-receiver
kopia lustrzana https://github.com/jprochazka/adsb-receiver
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Harmonize feeder build directory variables some more

pull/289/head
romeo-golf 2017-01-30 03:21:20 +00:00
rodzic 216fec71fb
commit 283823a94b
3 zmienionych plików z 27 dodań i 27 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

14
bash/feeders/flightradar24.sh
Wyświetl plik

@ -36,7 +36,7 @@
RECEIVER_ROOT_DIRECTORY="${PWD}"
RECEIVER_BASH_DIRECTORY="${RECEIVER_ROOT_DIRECTORY}/bash"
RECEIVER_BUILD_DIRECTORY="${RECEIVER_ROOT_DIRECTORY}/build"
FR24_BUILD_DIRECTORY="${RECEIVER_ROOT_DIRECTORY}/build/flightradar24"
COMPONENT_BUILD_DIRECTORY="${RECEIVER_BUILD_DIRECTORY}/flightradar24"
## INCLUDE EXTERNAL SCRIPTS
@ -100,12 +100,12 @@ echo -e ""
echo -e "\e[95m Begining the installation process...\e[97m"
echo -e ""
# Create the flightradar24 build directory if it does not exist.
if [[ ! -d "${FR24_BUILD_DIRECTORY}" ]] ; then
if [[ ! -d "${COMPONENT_BUILD_DIRECTORY}" ]] ; then
echo -e "\e[94m Creating the Flightradar24 feeder client build directory...\e[97m"
mkdir -vp ${FR24_BUILD_DIRECTORY}
mkdir -vp ${COMPONENT_BUILD_DIRECTORY}
fi
echo -e "\e[94m Entering the Flightradar24 feeder client build directory...\e[97m"
cd ${FR24_BUILD_DIRECTORY}
cd ${COMPONENT_BUILD_DIRECTORY}
if [[ `uname -m` = "armv7l" ]] || [[ `uname -m` = "armv6l" ]] || [[ `uname -m` = "aarch64" ]] ; then
## ARM INSTALLATION
@ -123,16 +123,16 @@ else
echo -e "\e[94m Detected the device architecture as I386...\e[97m"
echo -e "\e[94m Downloading the Flightradar24 feeder client package...\e[97m"
echo -e ""
wget http://feed.flightradar24.com/linux/fr24feed_${FR24CLIENTVERSIONI386}_i386.deb -O ${FR24_BUILD_DIRECTORY}/fr24feed_${FR24CLIENTVERSIONI386}_i386.deb
wget http://feed.flightradar24.com/linux/fr24feed_${FR24CLIENTVERSIONI386}_i386.deb -O ${COMPONENT_BUILD_DIRECTORY}/fr24feed_${FR24CLIENTVERSIONI386}_i386.deb
echo -e "\e[94m Installing the Flightradar24 feeder client package...\e[97m"
if [[ `lsb_release -si` = "Debian" ]] ; then
# Force architecture if this is Debian.
echo -e "\e[94m NOTE: dpkg executed with added flag --force-architecture.\e[97m"
echo -e ""
sudo dpkg -i --force-architecture ${FR24_BUILD_DIRECTORY}/fr24feed_${FR24CLIENTVERSIONI386}_i386.deb
sudo dpkg -i --force-architecture ${COMPONENT_BUILD_DIRECTORY}/fr24feed_${FR24CLIENTVERSIONI386}_i386.deb
else
echo -e ""
sudo dpkg -i ${FR24_BUILD_DIRECTORY}/fr24feed_${FR24CLIENTVERSIONI386}_i386.deb
sudo dpkg -i ${COMPONENT_BUILD_DIRECTORY}/fr24feed_${FR24CLIENTVERSIONI386}_i386.deb
fi
echo -e ""
echo -e "\e[94m Checking that the fr24feed package was installed properly...\e[97m"

22
bash/feeders/piaware.sh
Wyświetl plik

@ -36,7 +36,7 @@
RECEIVER_ROOT_DIRECTORY="${PWD}"
RECEIVER_BASH_DIRECTORY="${RECEIVER_ROOT_DIRECTORY}/bash"
RECEIVER_BUILD_DIRECTORY="${RECEIVER_ROOT_DIRECTORY}/build"
PIAWARE_BUILD_DIRECTORY="${RECEIVER_ROOT_DIRECTORY}/build/piaware_builder"
COMPONENT_BUILD_DIRECTORY="${RECEIVER_BUILD_DIRECTORY}/piaware_builder"
## INCLUDE EXTERNAL SCRIPTS
@ -91,10 +91,10 @@ CheckPackage itcl3
echo -e ""
echo -e "\e[95m Preparing the piaware_builder Git repository...\e[97m"
echo -e ""
if [[ -d "${PIAWARE_BUILD_DIRECTORY}" ]] && [[ -d "${PIAWARE_BUILD_DIRECTORY}/.git" ]] ; then
if [[ -d "${COMPONENT_BUILD_DIRECTORY}" ]] && [[ -d "${COMPONENT_BUILD_DIRECTORY}/.git" ]] ; then
# A directory with a git repository containing the source code already exists.
echo -e "\e[94m Entering the piaware_builder git repository directory...\e[97m"
cd ${PIAWARE_BUILD_DIRECTORY}
cd ${COMPONENT_BUILD_DIRECTORY}
echo -e "\e[94m Updating the local piaware_builder git repository...\e[97m"
echo -e ""
git pull
@ -112,23 +112,23 @@ fi
echo -e ""
echo -e "\e[95m Building and installing the PiAware package...\e[97m"
echo -e ""
if [[ ! "${PWD}" = "${PIAWARE_BUILD_DIRECTORY}" ]] ; then
if [[ ! "${PWD}" = "${COMPONENT_BUILD_DIRECTORY}" ]] ; then
echo -e "\e[94m Entering the piaware_builder git repository directory...\e[97m"
cd ${PIAWARE_BUILD_DIRECTORY}
cd ${COMPONENT_BUILD_DIRECTORY}
fi
echo -e "\e[94m Executing the PiAware build script...\e[97m"
echo -e ""
./sensible-build.sh jessie
echo -e ""
echo -e "\e[94m Entering the PiAware build directory...\e[97m"
cd ${PIAWARE_BUILD_DIRECTORY}/package-jessie
cd ${COMPONENT_BUILD_DIRECTORY}/package-jessie
echo -e "\e[94m Building the PiAware package...\e[97m"
echo -e ""
dpkg-buildpackage -b
echo -e ""
echo -e "\e[94m Installing the PiAware package...\e[97m"
echo -e ""
sudo dpkg -i ${PIAWARE_BUILD_DIRECTORY}/piaware_*.deb
sudo dpkg -i ${COMPONENT_BUILD_DIRECTORY}/piaware_*.deb
# Check that the PiAware package was installed successfully.
echo -e ""
@ -152,14 +152,14 @@ if [[ $(dpkg-query -W -f='${STATUS}' piaware 2>/dev/null | grep -c "ok installed
fi
# Move the .deb package into another directory simply to keep it for historical reasons.
if [[ ! -d "${PIAWARE_BUILD_DIRECTORY}/packages" ]] ; then
if [[ ! -d "${COMPONENT_BUILD_DIRECTORY}/packages" ]] ; then
echo -e "\e[94m Making the PiAware package archive directory...\e[97m"
mkdir -vp ${PIAWARE_BUILD_DIRECTORY}/packages
mkdir -vp ${COMPONENT_BUILD_DIRECTORY}/packages
fi
echo -e "\e[94m Moving the PiAware package into the package archive directory...\e[97m"
mv ${PIAWARE_BUILD_DIRECTORY}/piaware_*.deb ${PIAWARE_BUILD_DIRECTORY}/packages/
mv ${COMPONENT_BUILD_DIRECTORY}/piaware_*.deb ${COMPONENT_BUILD_DIRECTORY}/packages/
echo -e "\e[94m Moving the PiAware package changes file into the package archive directory...\e[97m"
mv ${PIAWARE_BUILD_DIRECTORY}/piaware_*.changes ${PIAWARE_BUILD_DIRECTORY}/packages/
mv ${COMPONENT_BUILD_DIRECTORY}/piaware_*.changes ${COMPONENT_BUILD_DIRECTORY}/packages/
## CONFIGURE FLIGHTAWARE

18
bash/feeders/planefinder.sh
Wyświetl plik

@ -36,7 +36,7 @@
RECEIVER_ROOT_DIRECTORY="${PWD}"
RECEIVER_BASH_DIRECTORY="${RECEIVER_ROOT_DIRECTORY}/bash"
RECEIVER_BUILD_DIRECTORY="${RECEIVER_ROOT_DIRECTORY}/build"
PLANEFINDER_BUILD_DIRECTORY="${RECEIVER_ROOT_DIRECTORY}/build/planefinder"
COMPONENT_BUILD_DIRECTORY="${RECEIVER_BUILD_DIRECTORY}/planefinder"
DEVICEIPADDRESS=`ip addr | grep 'state UP' -A2 | tail -n1 | awk '{print $2}' | cut -f1 -d'/'`
## INCLUDE EXTERNAL SCRIPTS
@ -93,19 +93,19 @@ echo -e ""
echo -e "\e[95m Downloading the Plane Finder ADS-B Client package...\e[97m"
echo -e ""
# Create the planefinder build directory if it does not exist.
if [[ ! -d "${PLANEFINDER_BUILD_DIRECTORY}" ]] ; then
if [[ ! -d "${COMPONENT_BUILD_DIRECTORY}" ]] ; then
echo -e "\e[94m Creating the Plane Finder ADS-B Client build directory...\e[97m"
mkdir -vp ${PLANEFINDER_BUILD_DIRECTORY}
mkdir -vp ${COMPONENT_BUILD_DIRECTORY}
fi
# Download the appropriate package depending on the devices architecture.
if [[ `uname -m` = "armv7l" ]] || [[ `uname -m` = "armv6l" ]] ; then
echo -e "\e[94m Downloading the Plane Finder ADS-B Client v${PFCLIENTVERSIONARM} for ARM devices...\e[97m"
echo -e ""
wget http://client.planefinder.net/pfclient_${PFCLIENTVERSIONARM}_armhf.deb -O ${PLANEFINDER_BUILD_DIRECTORY}/pfclient_${PFCLIENTVERSIONARM}_armhf.deb
wget http://client.planefinder.net/pfclient_${PFCLIENTVERSIONARM}_armhf.deb -O ${COMPONENT_BUILD_DIRECTORY}/pfclient_${PFCLIENTVERSIONARM}_armhf.deb
else
echo -e "\e[94m Downloading the Plane Finder ADS-B Client v${PFCLIENTVERSIONI386} for I386 devices...\e[97m"
echo -e ""
wget http://client.planefinder.net/pfclient_${PFCLIENTVERSIONI386}_i386.deb -O ${PLANEFINDER_BUILD_DIRECTORY}/pfclient_${PFCLIENTVERSIONI386}_i386.deb
wget http://client.planefinder.net/pfclient_${PFCLIENTVERSIONI386}_i386.deb -O ${COMPONENT_BUILD_DIRECTORY}/pfclient_${PFCLIENTVERSIONI386}_i386.deb
fi
## INSTALL THE PLANEFINDER ADS-B CLIENT PACKAGE
@ -113,22 +113,22 @@ fi
echo -e "\e[95m Installing the Plane Finder ADS-B Client package...\e[97m"
echo -e ""
echo -e "\e[94m Entering the Plane Finder ADS-B Client build directory...\e[97m"
cd ${PLANEFINDER_BUILD_DIRECTORY}
cd ${COMPONENT_BUILD_DIRECTORY}
# Install the proper package depending on the devices architecture.
if [[ `uname -m` = "armv7l" ]] || [[ `uname -m` = "armv6l" ]] || [[ `uname -m` = "aarch64" ]] ; then
echo -e "\e[94m Installing the Plane Finder ADS-B Client v${PFCLIENTVERSIONARM} for ARM devices package...\e[97m"
echo -e ""
sudo dpkg -i ${PLANEFINDER_BUILD_DIRECTORY}/pfclient_${PFCLIENTVERSIONARM}_armhf.deb
sudo dpkg -i ${COMPONENT_BUILD_DIRECTORY}/pfclient_${PFCLIENTVERSIONARM}_armhf.deb
else
echo -e "\e[94m Installing the Plane Finder ADS-B Client v${PFCLIENTVERSIONI386} for I386 devices package...\e[97m"
if [[ `lsb_release -si` = "Debian" ]] ; then
# Force architecture if this is Debian.
echo -e "\e[94m NOTE: dpkg executed with added flag --force-architecture.\e[97m"
echo -e ""
sudo dpkg -i --force-architecture ${PLANEFINDER_BUILD_DIRECTORY}/pfclient_${PFCLIENTVERSIONI386}_i386.deb
sudo dpkg -i --force-architecture ${COMPONENT_BUILD_DIRECTORY}/pfclient_${PFCLIENTVERSIONI386}_i386.deb
else
echo -e ""
sudo dpkg -i ${PLANEFINDER_BUILD_DIRECTORY}/pfclient_${PFCLIENTVERSIONI386}_i386.deb
sudo dpkg -i ${COMPONENT_BUILD_DIRECTORY}/pfclient_${PFCLIENTVERSIONI386}_i386.deb
fi
fi
# Check that the Plane Finder ADS-B Client package was installed successfully.