portal setup import functions and variables

jprochazka · Aug 13, 2024 · 9deef66 · 9deef66
1 parent 8f31b05
commit 9deef66
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/bash/portal/core.sh b/bash/portal/core.sh
@@ -1,5 +1,10 @@
 #!/bin/bash
 
+### INCLUDE EXTERNAL SCRIPTS
+
+source ${RECEIVER_BASH_DIRECTORY}/variables.sh
+source ${RECEIVER_BASH_DIRECTORY}/functions.sh
+
 ## VARIABLES
 
 PORTAL_BUILD_DIRECTORY="${RECEIVER_BUILD_DIRECTORY}/portal"

diff --git a/bash/portal/install.sh b/bash/portal/install.sh
@@ -616,7 +616,7 @@ unset ADSB_PORTAL_DATABASE_USER
 unset ADSB_PORTAL_DATABASE_PASSWORD1
 unset ADSB_PORTAL_DATABASE_NAME
 
-pi_address=`ip addr | grep 'state UP' -A2 | tail -n1 | awk '{print $2}' | cut -f1  -d'/'`
+ip_address=`ip addr | grep 'state UP' -A2 | tail -n1 | awk '{print $2}' | cut -f1  -d'/'`
 
 whiptail --backtitle "${RECEIVER_PROJECT_TITLE}" \
          --title "ADS-B Receiver Project Portal Setup" \