Export OS variables and fixed if statement.

pull/290/merge
Joe Prochazka 2018-03-23 13:21:13 -04:00
rodzic f17ca410dd
commit 58d5b62629
3 zmienionych plików z 3 dodań i 4 usunięć

Wyświetl plik

@ -36,8 +36,6 @@
RECEIVER_ROOT_DIRECTORY="${PWD}"
RECEIVER_BASH_DIRECTORY="${RECEIVER_ROOT_DIRECTORY}/bash"
RECEIVER_BUILD_DIRECTORY="${RECEIVER_ROOT_DIRECTORY}/build"
RECEIVER_OS_DISTRIBUTION=`. /etc/os-release; echo ${ID/*, /}`
RECEIVER_OS_RELEASE=`. /etc/os-release; echo ${VERSION_ID/*, /}`
## INCLUDE EXTERNAL SCRIPTS

Wyświetl plik

@ -73,7 +73,6 @@ fi
echo -e "\e[95m Installing packages needed to fulfill dependencies...\e[97m"
echo -e ""
CheckPackage lighttpd
CheckPackage bc
# Assign the Lighthttpd document root directory to a variable.
RAW_DOCUMENT_ROOT=`/usr/sbin/lighttpd -f /etc/lighttpd/lighttpd.conf -p | grep server.document-root`
@ -262,7 +261,7 @@ CheckPackage collectd-core
CheckPackage rrdtool
# Portal dependencies.
if [ $RECEIVER_MTA == "POSTFIX" ] || [ -z "$RECEIVER_MTA" ]; then
if [ "$RECEIVER_MTA" == "POSTFIX" ] || [ -z "$RECEIVER_MTA" ]; then
CheckPackage postfix
fi

Wyświetl plik

@ -44,6 +44,8 @@ ENABLE_LOGGING="false"
export RECEIVER_ROOT_DIRECTORY="${PWD}"
export RECEIVER_BASH_DIRECTORY="${PWD}/bash"
export RECEIVER_BUILD_DIRECTORY="${PWD}/build"
export RECEIVER_OS_DISTRIBUTION=`. /etc/os-release; echo ${ID/*, /}`
export RECEIVER_OS_RELEASE=`. /etc/os-release; echo ${VERSION_ID/*, /}`
## SOURCE EXTERNAL SCRIPTS