Fix error at upgrade_roundcube.sh: setting default value for 'PHP_DEBIAN_INSTALLATION' was missing.
This commit is contained in:
parent
f1cd028434
commit
2a39aa5f12
@ -107,6 +107,7 @@ DEFAULT_DB_HOST="localhost"
|
|||||||
DEFAULT_DB_NAME="roundcubemail"
|
DEFAULT_DB_NAME="roundcubemail"
|
||||||
DEFAULT_DB_USER="roundcube"
|
DEFAULT_DB_USER="roundcube"
|
||||||
|
|
||||||
|
|
||||||
echo
|
echo
|
||||||
echononl " Include Configuration file.."
|
echononl " Include Configuration file.."
|
||||||
if [[ ! -f $conf_file ]]; then
|
if [[ ! -f $conf_file ]]; then
|
||||||
@ -128,6 +129,8 @@ if [[ ! -d "$CUR_INSTALL_DIR" ]] ; then
|
|||||||
fatal "No current installation of roundcube found!"
|
fatal "No current installation of roundcube found!"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
[[ -n "$PHP_DEBIAN_INSTALLATION" ]] || PHP_DEBIAN_INSTALLATION=false
|
||||||
|
|
||||||
[[ -n "$DB_TYPE" ]] || fatal "Database Type of Roundcube Database (DB_TYPE) not present!"
|
[[ -n "$DB_TYPE" ]] || fatal "Database Type of Roundcube Database (DB_TYPE) not present!"
|
||||||
[[ -n "$DB_HOST" ]] || DB_HOST="$DEFAULT_DB_HOST"
|
[[ -n "$DB_HOST" ]] || DB_HOST="$DEFAULT_DB_HOST"
|
||||||
[[ -n "$DB_NAME" ]] || DB_NAME="$DEFAULT_DB_NAME"
|
[[ -n "$DB_NAME" ]] || DB_NAME="$DEFAULT_DB_NAME"
|
||||||
@ -551,15 +554,15 @@ else
|
|||||||
echononl " Start PHP FPM engine v${php_major_version}.."
|
echononl " Start PHP FPM engine v${php_major_version}.."
|
||||||
if [[ -f "/etc/init.d/php$(echo $php_major_version | cut -d'.' -f1)-fpm" ]] ; then
|
if [[ -f "/etc/init.d/php$(echo $php_major_version | cut -d'.' -f1)-fpm" ]] ; then
|
||||||
/etc/init.d/php$(echo $php_major_version | cut -d'.' -f1)-fpm start > $log_file 2>&1
|
/etc/init.d/php$(echo $php_major_version | cut -d'.' -f1)-fpm start > $log_file 2>&1
|
||||||
|
if [[ $? -eq 0 ]]; then
|
||||||
|
echo_ok
|
||||||
|
else
|
||||||
|
echo_failed
|
||||||
|
error "$(cat $log_file)"
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
echo_skipped
|
echo_skipped
|
||||||
fi
|
fi
|
||||||
if [[ $? -eq 0 ]]; then
|
|
||||||
echo_ok
|
|
||||||
else
|
|
||||||
echo_failed
|
|
||||||
error "$(cat $log_file)"
|
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
echo_skipped
|
echo_skipped
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user