install_roundcube.sh: some code fixes.

This commit is contained in:
Christoph 2021-04-19 01:48:48 +02:00
parent 063a634963
commit 4790e3d9d4

View File

@ -108,6 +108,13 @@ is_number() {
#return $([[ ! -z "${1##*[!0-9]*}" ]])
}
trim() {
local var="$*"
var="${var#"${var%%[![:space:]]*}"}" # remove leading whitespace characters
var="${var%"${var##*[![:space:]]}"}" # remove trailing whitespace characters
echo -n "$var"
}
trap clean_up SIGHUP SIGINT SIGTERM
@ -164,6 +171,7 @@ fi
# - Sort array
# -
IFS=$'\n' website_arr=($(sort <<<"${unsorted_website_arr[*]}"))
IFS=' '
WEBSITE_NAME=
@ -552,13 +560,20 @@ _log_dir=${_src_base_dir}/log-roundcube-$_version
# - * Composer installed either locally or globally (https://getcomposer.org)
needed_php_pear_modules="
needed_php_pear_modules=""
_needed_php_pear_modules="
MDB2
Mail_Mime
Mail_mimeDecode
Net_SMTP
Net_IDNA2
Auth_SASL"
Auth_SASL
"
for _module in $_needed_php_pear_modules ; do
_module="$(trim $_module)"
needed_php_pear_modules="$needed_php_pear_modules $_module"
done
if [[ "$DB_TYPE" = "pgsql" ]]; then
needed_php_pear_modules="$needed_php_pear_modules MDB2_Driver_pgsql"
@ -583,6 +598,7 @@ if $PHP_DEBIAN_INSTALLATION ; then
fi
for _module in $needed_php_pear_modules ; do
_module="$(trim $_module)"
echononl "\tInstall Module '$_module'.."
if ! pear list | grep -q "$_module" 2> /dev/null ; then
pear install $_module > $log_file 2>&1
@ -621,6 +637,7 @@ else
for _module in $needed_php_pear_modules ; do
_module="$(trim $_module)"
echononl "\tInstall Module '$_module'.."
if ! /usr/local/php-${_version}/bin/pear list | grep -q "$_module" 2> /dev/null ; then
/usr/local/php-${_version}/bin/pear install $_module > $log_file 2>&1
@ -1938,6 +1955,7 @@ _needed_packages_spell="
aspell-fr
aspell-it"
for _pkg in $_needed_packages_spell ; do
_pkg="$(trim $_pkg)"
if aptitude search "$_pkg" | grep " $_pkg " | grep -e "^i" > /dev/null 2>&1 ; then
continue
else
@ -2901,7 +2919,7 @@ if [[ "$POSTFIX_DB_TYPE" = 'pgsql' ]] ; then
su - postgres -c "psql -t -c \"CREATE LANGUAGE plpgsql;\"" > $log_file 2>&1
if [[ $? -ne 0 ]] ; then
echo_failed
erro $(cat $log_file)
error $(cat $log_file)
else
echo_ok
fi
@ -2994,6 +3012,11 @@ EOF
_failed=true
fi
chmod 600 ~/.pgpass
if [[ $? -ne 0 ]]; then
_failed=true
fi
echo "" >> $log_file
echo "psql -w -U $POSTFIX_DB_USER $POSTFIX_DB_NAME < $_psql_trigger_file" >> $log_file
psql -w -U $POSTFIX_DB_USER $POSTFIX_DB_NAME < $_psql_trigger_file >> $log_file 2>&1
@ -3019,7 +3042,7 @@ EOF
if $_failed ; then
echo_failed
erro $(cat $log_file)
error $(cat $log_file)
else
echo_ok
fi
@ -3088,6 +3111,11 @@ EOF
_failed=true
fi
chmod 600 ~/.pgpass
if [[ $? -ne 0 ]]; then
_failed=true
fi
echo "" >> $log_file
echo "psql -w -U $POSTFIX_DB_USER $POSTFIX_DB_NAME < $_psql_trigger_file" >> $log_file
psql -w -U $POSTFIX_DB_USER $POSTFIX_DB_NAME < $_psql_trigger_file >> $log_file 2>&1
@ -3113,7 +3141,7 @@ EOF
if $_failed ; then
echo_failed
erro $(cat $log_file)
error $(cat $log_file)
else
echo_ok
fi
@ -3182,6 +3210,11 @@ EOF
_failed=true
fi
chmod 600 ~/.pgpass
if [[ $? -ne 0 ]]; then
_failed=true
fi
echo "" >> $log_file
echo "psql -w -U $POSTFIX_DB_USER $POSTFIX_DB_NAME < $_psql_trigger_file" >> $log_file
psql -w -U $POSTFIX_DB_USER $POSTFIX_DB_NAME < $_psql_trigger_file >> $log_file 2>&1
@ -3207,7 +3240,7 @@ EOF
if $_failed ; then
echo_failed
erro $(cat $log_file)
error $(cat $log_file)
else
echo_ok
fi