diff --git a/CHANGELOG.md b/CHANGELOG.md index d5e8d7d..d67364d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ The following is a history of the changes made to this project. * Pagination on the flights page has been minimized. * Corrected the page count on the flights page. * Added -d --development flags to install.sh to avoid overwriting changes made. +* All .deb packages built by the scripts are archived in an archive folder. ## v2.5.0 *(December 5th, 2016)* diff --git a/bash/decoders/dump1090-fa.sh b/bash/decoders/dump1090-fa.sh index 4f5e7a3..0765385 100755 --- a/bash/decoders/dump1090-fa.sh +++ b/bash/decoders/dump1090-fa.sh @@ -238,7 +238,7 @@ fi # Archive binary package. echo -e "\e[94m Moving the dump1090-mutability binary package into the archive directory...\e[97m" echo "" -mv -vf ${RECEIVER_BUILD_DIRECTORY}/dump1090-fa/dump1090-fa_*.deb ${RECEIVER_BUILD_DIRECTORY}/package-archive 2>&1 +cp -vf ${RECEIVER_BUILD_DIRECTORY}/dump1090-fa/*.deb ${RECEIVER_BUILD_DIRECTORY}/package-archive/ 2>&1 ## DUMP1090-FA POST INSTALLATION CONFIGURATION diff --git a/bash/decoders/dump1090-mutability.sh b/bash/decoders/dump1090-mutability.sh index 186a515..b6f5f6a 100755 --- a/bash/decoders/dump1090-mutability.sh +++ b/bash/decoders/dump1090-mutability.sh @@ -204,7 +204,7 @@ if [[ -n "${CPU_ARCHITECTURE}" ]] ; then # Archive binary package. echo -e "\e[94m Moving the dump1090-mutability binary package into the archive directory...\e[97m" echo -e "" - mv -vf ${RECEIVER_BUILD_DIRECTORY}/dump1090-mutability/dump1090-mutability_*.deb ${RECEIVER_BUILD_DIRECTORY}/package-archive 2>&1 + cp -vf ${RECEIVER_BUILD_DIRECTORY}/dump1090-mutability/*.deb ${RECEIVER_BUILD_DIRECTORY}/package-archive/ 2>&1 fi fi diff --git a/bash/extras/beastsplitter.sh b/bash/extras/beastsplitter.sh index 4a41a86..1c90b6c 100755 --- a/bash/extras/beastsplitter.sh +++ b/bash/extras/beastsplitter.sh @@ -192,7 +192,7 @@ fi # Archive binary package. echo -e "\e[94m Moving the beast-splitter package into the archive directory...\e[97m" echo "" -mv -vf ${RECEIVER_BUILD_DIRECTORY}/beast-splitter/beast-splitter_*.deb ${RECEIVER_BUILD_DIRECTORY}/package-archive/ 2>&1 +cp -vf ${RECEIVER_BUILD_DIRECTORY}/beast-splitter/*.deb ${RECEIVER_BUILD_DIRECTORY}/package-archive/ 2>&1 echo "" ## CREATE SCRIPTS diff --git a/bash/feeders/piaware.sh b/bash/feeders/piaware.sh index 54aa4a0..73614e2 100755 --- a/bash/feeders/piaware.sh +++ b/bash/feeders/piaware.sh @@ -205,13 +205,7 @@ if [[ -n "${CPU_ARCHITECTURE}" ]] ; then # Archive binary package. echo -e "\e[94m Moving the FlightAware PiAware client binary package into the archive directory...\e[97m" echo "" - mv -vf ${RECEIVER_BUILD_DIRECTORY}/piaware_builder/piaware_*.deb ${RECEIVER_BUILD_DIRECTORY}/package-archive 2>&1 - echo "" - - # Archive changelog. - echo -e "\e[94m Moving the FlightAware PiAware client changes file into the archive directory...\e[97m" - echo "" - mv -vf ${RECEIVER_BUILD_DIRECTORY}/piaware_builder/piaware_*.changes ${RECEIVER_BUILD_DIRECTORY}/package-archive 2>&1 + cp -vf ${RECEIVER_BUILD_DIRECTORY}/piaware_builder/*.deb ${RECEIVER_BUILD_DIRECTORY}/package-archive/ 2>&1 echo "" fi fi diff --git a/build/portal/html/dump978/config.js b/build/portal/html/dump978/config.js index baa3a52..bacd2b4 100644 --- a/build/portal/html/dump978/config.js +++ b/build/portal/html/dump978/config.js @@ -35,8 +35,8 @@ DefaultZoomLvl = 7; // that location is used and these settings are ignored. SiteShow = false; // true to show a center marker -SiteLat = 45.0; // position of the marker -SiteLon = 9.0; +SiteLat = "41.3872537" +SiteLon = "-82.0769568" SiteName = "My Radar Site"; // tooltip of the marker // -- Marker settings -------------------------------------