diff --git a/scripts/_common.sh b/scripts/_common.sh index 4e72852..314e0a8 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -10,7 +10,7 @@ nodejs_version=16 YNH_PHP_VERSION="8.0" # dependencies used by the app -pkg_dependencies="php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-exif php${YNH_PHP_VERSION}-fileinfo php${YNH_PHP_VERSION}-gettext php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-fileinfo php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-xml" +pkg_dependencies="brotli php${YNH_PHP_VERSION}-pdo_mysql php${YNH_PHP_VERSION}-exif php${YNH_PHP_VERSION}-fileinfo php${YNH_PHP_VERSION}-gettext php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-fileinfo php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-xml" YNH_COMPOSER_VERSION="2.3.5" diff --git a/scripts/install b/scripts/install index 916cb19..03befc5 100644 --- a/scripts/install +++ b/scripts/install @@ -133,11 +133,11 @@ ynh_install_composer --install_args="--no-dev" #================================================= # INSTALL AND INITIALIZE COMPOSER #================================================= -ynh_script_progression --message="Installing with Composer..." --weight=30 +ynh_script_progression --message="Installing $app..." --weight=30 pushd "$final_path" #ynh_exec_warn_less ynh_exec_as $app php$phpversion composer.phar install --prefer-dist --no-progress --no-dev - ynh_composer_exec phpversion=$phpversion --workdir=$final_path --commands="install --prefer-dist --no-progress --no-dev" + ynh_composer_exec --commands="install --prefer-dist --no-progress --no-dev" ynh_script_progression --message="Yarn install..." ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH npm install --save https://github.com/foliojs/brotli.js/tarball/master