Moved CheckPackage to functions.sh

bash/decoders/dump1090-mutability.sh

@@ -102,7 +102,7 @@ sudo dpkg -i dump1090-mutability_1.15~dev_*.deb
 
 ## CHECK THAT THE PACKAGE INSTALLED
 
-if [ $(dpkg-query -W -f='${Status}' dump1090-mutability 2>/dev/null | grep -c "ok installed") -eq 0 ]; then
+if [ $(dpkg-query -W -f='${STATUS}' dump1090-mutability 2>/dev/null | grep -c "ok installed") -eq 0 ]; then
     echo "\033[31m"
     echo "The dump1090-mutability package did not install properly!"
     echo -e "\033[33m"

bash/feeders/adsbexchange.sh

@@ -31,9 +31,10 @@
 #                                                                                   #
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 
-BUILDDIR=${PWD}
+BUILDDIR=$PWD
+ADSBEXCHANGEDIR="$PWD/adsbexchange"
 
-source ../functions.sh
+source ../bash/functions.sh
 
 clear
 
@@ -79,7 +80,7 @@ fi
 
 echo -e "\033[33mSetting permissions on adsbexchange-maint.sh..."
 echo -e "\033[37m"
-sudo chmod +x $BUILDDIR/adsbexchange/adsbexchange-maint.sh
+sudo chmod +x $ADSBEXCHANGEDIR/adsbexchange-maint.sh
 
 echo -e "\033[33mAdding startup line to rc.local..."
 echo -e "\033[37m"
@@ -90,7 +91,7 @@ lnum=($(sed -n '/exit 0/=' /etc/rc.local))
 
 echo -e "\033[33mExecuting adsbexchange-maint.sh..."
 echo -e "\033[37m"
-sudo $BUILDDIR/adsbexchange/adsbexchange-maint.sh &
+sudo $ADSBEXCHANGEDIR/adsbexchange-maint.sh &
 
 echo -e "\033[33mConfiguration of the ADS-B Exchange feed is now complete."
 echo "Please look over the output generated to be sure no errors were encountered."

bash/feeders/piaware.sh

@@ -40,8 +40,9 @@ CURRENTVERSION="2.1-5-jessie"
 CURRENTVERSIONNAME="2.1-5"
 
 BUILDDIR=${PWD}
+PIAWAREDIR="$PWD/piaware_builder"
 
-source ../functions.sh
+source ../bash/functions.sh
 
 clear
 
@@ -88,12 +89,12 @@ CheckPackage itcl3
 ## DOWNLOAD OR UPDATE THE PIAWARE_BUILDER SOURCE
 
 # Check if the git repository already exists locally.
-if [ -d "$BUILDDIR/piaware_builder" ] && [ -d $BUILDDIR/piaware_builder/.git ]; then
+if [ -d $PIAWAREDIR ] && [ -d $PIAWAREDIR/.git ]; then
     # A directory with a git repository containing the source code exists.
     echo -e "\033[33m"
     echo "Updating the local piaware_builder git repository..."
     echo -e "\033[37m"
-    cd $BUILDDIR/piaware_builder
+    cd $PIAWAREDIR
     git pull origin master
 else
     # A directory containing the source code does not exist in the build directory.
@@ -101,7 +102,7 @@ else
     echo "Cloning the piaware_builder git repository locally..."
     echo -e "\033[37m"
     git clone https://github.com/flightaware/piaware_builder.git
-    cd $BUILDDIR/piaware_builder
+    cd $PIAWAREDIR
     git checkout tags/v${CURRENTVERSION}
 fi
 
@@ -111,7 +112,7 @@ echo -e "\033[33m"
 echo "Building the PiAware package..."
 echo -e "\033[37m"
 ./sensible-build.sh
-cd $BUILDDIR/piaware_builder/package
+cd $PIAWAREDIR/package
 dpkg-buildpackage -b
 
 ## INSTALL THE PIAWARE PACKAGE
@@ -124,11 +125,11 @@ echo -e "\033[37m"
 # READ THE COMMENT PERTAINING TO THE VARIABLE CURRENTVERSIONNAME AT THE TOP OF THE SCRIPT #
 ###########################################################################################
 #sudo dpkg -i $BUILDDIR/piaware_builder/piaware_${CURRENTVERSION}_*.deb
-sudo dpkg -i $BUILDDIR/piaware_builder/piaware_${CURRENTVERSIONNAME}_*.deb
+sudo dpkg -i $PIAWAREDIR/piaware_${CURRENTVERSIONNAME}_*.deb
 
 ## CHECK THAT THE PACKAGE INSTALLED
 
-if [ $(dpkg-query -W -f='${Status}' piaware 2>/dev/null | grep -c "ok installed") -eq 0 ]; then
+if [ $(dpkg-query -W -f='${STATUS}' piaware 2>/dev/null | grep -c "ok installed") -eq 0 ]; then
     echo "\033[31m"
     echo "The piaware package did not install properly!"
     echo -e "\033[33m"

bash/feeders/planefinder.sh

@@ -31,14 +31,14 @@
 #                                                                                   #
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 
-BUILDDIR=${PWD}
+BUILDDIR=$PWD
 
 ## DECLARE THE CURRENT VERSIONS OF THE SOFTWARE
 
 ARMVERSION="3.1.201"
 I386VERSION="3.0.2080"
 
-source functions.sh
+source ../bash/functions.sh
 
 clear
 
@@ -104,7 +104,7 @@ fi
 
 ## CHECK THAT THE PACKAGE INSTALLED
 
-if [ $(dpkg-query -W -f='${Status}' pfclient 2>/dev/null | grep -c "ok installed") -eq 0 ]; then
+if [ $(dpkg-query -W -f='${STATUS}' pfclient 2>/dev/null | grep -c "ok installed") -eq 0 ]; then
     echo "\033[31m"
     echo "The piaware package did not install properly!"
     echo -e "\033[33m"

bash/functions.sh

@@ -69,7 +69,7 @@ function CheckPackage {
             fi
 
             # Attempt to install the required package.
-            echo ""
+            echo -e "\033[37m"
             ATTEMPT=$((ATTEMPT+1))
             sudo apt-get install -y $1
             echo ""

install.sh

@@ -127,9 +127,9 @@ function InstallAdsbExchange() {
     cd $BUILDDIR
     echo -e "\033[33mExecuting the ADS-B Exchange installation script..."
     echo -e "\033[37m"
-    chmod +x $SCRIPTDIR/bash/feeders/adsbexchange.sh
-    $SCRIPTDIR/bash/feeders/adsbexchange.sh
-    cd $SCRIPTDIR
+    chmod +x $BASHDIR/bash/feeders/adsbexchange.sh
+    $BASHDIR/feeders/adsbexchange.sh
+    cd $BASEDIR
 }
 
 # Setup and execute the web portal installation scripts.