Widescale application of s/BUILDDIRECTORY/RECEIVER_BUILD_DIRECTORY/g

pull/289/head
romeo-golf 2017-01-30 03:12:34 +00:00
rodzic 19481a0be8
commit d9c42ed59a
9 zmienionych plików z 28 dodań i 28 usunięć

Wyświetl plik

@ -35,7 +35,7 @@
RECEIVER_ROOT_DIRECTORY="${PWD}"
RECEIVER_BASH_DIRECTORY="${RECEIVER_ROOT_DIRECTORY}/bash"
BUILDDIRECTORY="${RECEIVER_ROOT_DIRECTORY}/build"
RECEIVER_BUILD_DIRECTORY="${RECEIVER_ROOT_DIRECTORY}/build"
FR24_BUILD_DIRECTORY="${RECEIVER_ROOT_DIRECTORY}/build/flightradar24"
## INCLUDE EXTERNAL SCRIPTS

Wyświetl plik

@ -35,7 +35,7 @@
RECEIVER_ROOT_DIRECTORY="${PWD}"
RECEIVER_BASH_DIRECTORY="${RECEIVER_ROOT_DIRECTORY}/bash"
BUILDDIRECTORY="${RECEIVER_ROOT_DIRECTORY}/build"
RECEIVER_BUILD_DIRECTORY="${RECEIVER_ROOT_DIRECTORY}/build"
PIAWARE_BUILD_DIRECTORY="${RECEIVER_ROOT_DIRECTORY}/build/piaware_builder"
## INCLUDE EXTERNAL SCRIPTS
@ -101,7 +101,7 @@ if [[ -d "${PIAWARE_BUILD_DIRECTORY}" ]] && [[ -d "${PIAWARE_BUILD_DIRECTORY}/.g
else
# A directory containing the source code does not exist in the build directory.
echo -e "\e[94m Entering the ADS-B Receiver Project build directory...\e[97m"
cd ${BUILDDIRECTORY}
cd ${RECEIVER_BUILD_DIRECTORY}
echo -e "\e[94m Cloning the piaware_builder git repository locally...\e[97m"
echo -e ""
git clone https://github.com/flightaware/piaware_builder.git

Wyświetl plik

@ -35,7 +35,7 @@
RECEIVER_ROOT_DIRECTORY="${PWD}"
RECEIVER_BASH_DIRECTORY="${RECEIVER_ROOT_DIRECTORY}/bash"
BUILDDIRECTORY="${RECEIVER_ROOT_DIRECTORY}/build"
RECEIVER_BUILD_DIRECTORY="${RECEIVER_ROOT_DIRECTORY}/build"
PLANEFINDER_BUILD_DIRECTORY="${RECEIVER_ROOT_DIRECTORY}/build/planefinder"
DEVICEIPADDRESS=`ip addr | grep 'state UP' -A2 | tail -n1 | awk '{print $2}' | cut -f1 -d'/'`

Wyświetl plik

@ -503,7 +503,7 @@ declare array EXTRAS_LIST
touch ${RECEIVER_ROOT_DIRECTORY}/EXTRAS_CHOICES
# Check if the AboveTustin repository has been cloned.
if [[ -d "${BUILDDIRECTORY}/AboveTustin" ]] && [[ -d "${BUILDDIRECTORY}/AboveTustin/.git" ]] ; then
if [[ -d "${RECEIVER_BUILD_DIRECTORY}/AboveTustin" ]] && [[ -d "${RECEIVER_BUILD_DIRECTORY}/AboveTustin/.git" ]] ; then
# The AboveTustin repository has been cloned to this device.
if [[ "${RECEIVER_AUTOMATED_INSTALL}" = "false" ]] ; then
# Add this choice to the EXTRAS_LIST array to be used by the whiptail menu.
@ -556,7 +556,7 @@ else
fi
# Check if the Duck DNS update script exists.
if [[ ! -f "${BUILDDIRECTORY}/duckdns/duck.sh" ]] ; then
if [[ ! -f "${RECEIVER_BUILD_DIRECTORY}/duckdns/duck.sh" ]] ; then
# Duck DNS does not appear to be set up on this device.
if [[ "${RECEIVER_AUTOMATED_INSTALL}" = "false" ]] ; then
# Add this choice to the EXTRAS_LIST array to be used by the whiptail menu.

Wyświetl plik

@ -34,8 +34,8 @@
## VARIABLES
RECEIVER_ROOT_DIRECTORY="${PWD}"
BUILDDIRECTORY="${RECEIVER_ROOT_DIRECTORY}/build"
PORTAL_BUILD_DIRECTORY="${BUILDDIRECTORY}/portal"
RECEIVER_BUILD_DIRECTORY="${RECEIVER_ROOT_DIRECTORY}/build"
PORTAL_BUILD_DIRECTORY="${RECEIVER_BUILD_DIRECTORY}/portal"
PORTAL_PYTHON_DIRECTORY="${PORTAL_BUILD_DIRECTORY}/python"
DATABASEENGINE=${ADSB_DATABASEENGINE}

Wyświetl plik

@ -34,8 +34,8 @@
## VARIABLES
RECEIVER_ROOT_DIRECTORY="${PWD}"
BUILDDIRECTORY="${RECEIVER_ROOT_DIRECTORY}/build"
PORTAL_BUILD_DIRECTORY="${BUILDDIRECTORY}/portal"
RECEIVER_BUILD_DIRECTORY="${RECEIVER_ROOT_DIRECTORY}/build"
PORTAL_BUILD_DIRECTORY="${RECEIVER_BUILD_DIRECTORY}/portal"
COLLECTD_CONFIG="/etc/collectd/collectd.conf"
COLLECTD_CRON_FILE="/etc/cron.d/adsb-receiver-performance-graphs"

Wyświetl plik

@ -35,8 +35,8 @@
RECEIVER_ROOT_DIRECTORY="${PWD}"
RECEIVER_BASH_DIRECTORY="${RECEIVER_ROOT_DIRECTORY}/bash"
BUILDDIRECTORY="${RECEIVER_ROOT_DIRECTORY}/build"
PORTAL_BUILD_DIRECTORY="${BUILDDIRECTORY}/portal"
RECEIVER_BUILD_DIRECTORY="${RECEIVER_ROOT_DIRECTORY}/build"
PORTAL_BUILD_DIRECTORY="${RECEIVER_BUILD_DIRECTORY}/portal"
## INCLUDE EXTERNAL SCRIPTS
@ -349,7 +349,7 @@ sudo chmod 666 ${LIGHTTPDDOCUMENTROOT}/data/*
# Check if dump978 was setup.
echo -e "\e[94m Checking if dump978 was set up...\e[97m"
if [[ `grep -cFx "${BUILDDIRECTORY}/dump978/dump978-maint.sh &" /etc/rc.local` -eq 0 ]] ; then
if [[ `grep -cFx "${RECEIVER_BUILD_DIRECTORY}/dump978/dump978-maint.sh &" /etc/rc.local` -eq 0 ]] ; then
# Check if a heywhatsthat.com range file exists in the dump1090 HTML folder.
echo -e "\e[94m Checking for the file upintheair.json in the dump1090 HTML folder...\e[97m"
if [[ -f "/usr/share/dump1090-mutability/html/upintheair.json" ]] || [[ -f "/usr/share/dump1090-fa/html/upintheair.json" ]] ; then

Wyświetl plik

@ -34,8 +34,8 @@
## VARIABLES
RECEIVER_ROOT_DIRECTORY="${PWD}"
BUILDDIRECTORY="${RECEIVER_ROOT_DIRECTORY}/build"
PORTAL_BUILD_DIRECTORY="${BUILDDIRECTORY}/portal"
RECEIVER_BUILD_DIRECTORY="${RECEIVER_ROOT_DIRECTORY}/build"
PORTAL_BUILD_DIRECTORY="${RECEIVER_BUILD_DIRECTORY}/portal"
PORTAL_PYTHON_DIRECTORY="${PORTAL_BUILD_DIRECTORY}/python"
PYTHONPATH=`which python`

Wyświetl plik

@ -48,7 +48,7 @@ clear
RECEIVER_ROOT_DIRECTORY="${PWD}"
RECEIVER_BASH_DIRECTORY="${RECEIVER_ROOT_DIRECTORY}/bash"
BUILDDIRECTORY="${RECEIVER_ROOT_DIRECTORY}/build"
RECEIVER_BUILD_DIRECTORY="${RECEIVER_ROOT_DIRECTORY}/build"
## INCLUDE EXTERNAL SCRIPTS
@ -95,12 +95,12 @@ case ${DUMP1090OPTION} in
echo -e ""
echo -e "\e[95m Installing dump1090-mutability...\e[97m"
echo -e ""
mkdir -vp ${BUILDDIRECTORY}/dump1090-mutability
cd ${BUILDDIRECTORY}/dump1090-mutability
mkdir -vp ${RECEIVER_BUILD_DIRECTORY}/dump1090-mutability
cd ${RECEIVER_BUILD_DIRECTORY}/dump1090-mutability
git clone https://github.com/mutability/dump1090.git
cd ${BUILDDIRECTORY}/dump1090-mutability/dump1090
cd ${RECEIVER_BUILD_DIRECTORY}/dump1090-mutability/dump1090
dpkg-buildpackage -b
cd ${BUILDDIRECTORY}/dump1090-mutability
cd ${RECEIVER_BUILD_DIRECTORY}/dump1090-mutability
sudo dpkg -i dump1090-mutability_1.15~dev_*.deb
;;
"dump1090-fa")
@ -126,22 +126,22 @@ case ${DUMP1090OPTION} in
echo -e ""
echo -e "\e[95m Installing dump1090-fa...\e[97m"
echo -e ""
mkdir -vp ${BUILDDIRECTORY}/dump1090-fa
cd ${BUILDDIRECTORY}/dump1090-fa
mkdir -vp ${RECEIVER_BUILD_DIRECTORY}/dump1090-fa
cd ${RECEIVER_BUILD_DIRECTORY}/dump1090-fa
git clone https://github.com/flightaware/dump1090.git
cd ${BUILDDIRECTORY}/dump1090-fa/dump1090
cd ${RECEIVER_BUILD_DIRECTORY}/dump1090-fa/dump1090
dpkg-buildpackage -b
cd ${BUILDDIRECTORY}/dump1090-fa
cd ${RECEIVER_BUILD_DIRECTORY}/dump1090-fa
sudo dpkg -i dump1090-fa_*.deb
# PiAware
cd ${BUILDDIRECTORY}
cd ${RECEIVER_BUILD_DIRECTORY}
git clone https://github.com/flightaware/piaware_builder.git
cd ${BUILDDIRECTORY}/piaware_builder
cd ${RECEIVER_BUILD_DIRECTORY}/piaware_builder
./sensible-build.sh jessie
cd ${BUILDDIRECTORY}/piaware_builder/package-jessie
cd ${RECEIVER_BUILD_DIRECTORY}/piaware_builder/package-jessie
dpkg-buildpackage -b
sudo dpkg -i ${BUILDDIRECTORY}/piaware_builder/piaware_*.deb
sudo dpkg -i ${RECEIVER_BUILD_DIRECTORY}/piaware_builder/piaware_*.deb
;;
*)
# Nothing selected.