diff --git a/upgrade_roundcube.sh b/upgrade_roundcube.sh index f74569f..1b1cdbe 100755 --- a/upgrade_roundcube.sh +++ b/upgrade_roundcube.sh @@ -107,6 +107,7 @@ DEFAULT_DB_HOST="localhost" DEFAULT_DB_NAME="roundcubemail" DEFAULT_DB_USER="roundcube" + echo echononl " Include Configuration file.." if [[ ! -f $conf_file ]]; then @@ -128,6 +129,8 @@ if [[ ! -d "$CUR_INSTALL_DIR" ]] ; then fatal "No current installation of roundcube found!" fi +[[ -n "$PHP_DEBIAN_INSTALLATION" ]] || PHP_DEBIAN_INSTALLATION=false + [[ -n "$DB_TYPE" ]] || fatal "Database Type of Roundcube Database (DB_TYPE) not present!" [[ -n "$DB_HOST" ]] || DB_HOST="$DEFAULT_DB_HOST" [[ -n "$DB_NAME" ]] || DB_NAME="$DEFAULT_DB_NAME" @@ -551,15 +554,15 @@ else echononl " Start PHP FPM engine v${php_major_version}.." 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 + if [[ $? -eq 0 ]]; then + echo_ok + else + echo_failed + error "$(cat $log_file)" + fi else echo_skipped fi - if [[ $? -eq 0 ]]; then - echo_ok - else - echo_failed - error "$(cat $log_file)" - fi else echo_skipped fi