YunoHost-Apps/movim_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/movim_ynh.git synced 2024-09-03 19:46:19 +02:00
Code Issues Activity Actions

Fix

Browse source
This commit is contained in:
ericgaspar 2021-02-21 16:07:49 +01:00
parent fb7ffc6ac7
commit b997da6695
No known key found for this signature in database
GPG key ID: 574F281483054D44
3 changed files with 56 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

108
scripts/_common.sh
View file

@ -24,62 +24,62 @@ extra_php_dependencies="php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-mbstrin
#================================================= #=================================================
# readonly YNH_DEFAULT_COMPOSER_VERSION=1.10.17 readonly YNH_DEFAULT_COMPOSER_VERSION=2.0.9
# # Declare the actual composer version to use. # Declare the actual composer version to use.
# # A packager willing to use another version of composer can override the variable into its _common.sh. # A packager willing to use another version of composer can override the variable into its _common.sh.
# YNH_COMPOSER_VERSION=${YNH_COMPOSER_VERSION:-$YNH_DEFAULT_COMPOSER_VERSION} YNH_COMPOSER_VERSION=${YNH_COMPOSER_VERSION:-$YNH_DEFAULT_COMPOSER_VERSION}
# # Execute a command with Composer # Execute a command with Composer
# # #
# # usage: ynh_composer_exec [--phpversion=phpversion] [--workdir=$final_path] --commands="commands" # usage: ynh_composer_exec [--phpversion=phpversion] [--workdir=$final_path] --commands="commands"
# # | arg: -v, --phpversion - PHP version to use with composer # | arg: -v, --phpversion - PHP version to use with composer
# # | arg: -w, --workdir - The directory from where the command will be executed. Default $final_path. # | arg: -w, --workdir - The directory from where the command will be executed. Default $final_path.
# # | arg: -c, --commands - Commands to execute. # | arg: -c, --commands - Commands to execute.
# ynh_composer_exec () { ynh_composer_exec () {
# # Declare an array to define the options of this helper. # Declare an array to define the options of this helper.
# local legacy_args=vwc local legacy_args=vwc
# declare -Ar args_array=( [v]=phpversion= [w]=workdir= [c]=commands= ) declare -Ar args_array=( [v]=phpversion= [w]=workdir= [c]=commands= )
# local phpversion local phpversion
# local workdir local workdir
# local commands local commands
# # Manage arguments with getopts # Manage arguments with getopts
# ynh_handle_getopts_args "$@" ynh_handle_getopts_args "$@"
# workdir="${workdir:-$final_path}" workdir="${workdir:-$final_path}"
# phpversion="${phpversion:-$YNH_PHP_VERSION}" phpversion="${phpversion:-$YNH_PHP_VERSION}"
# COMPOSER_HOME="$workdir/.composer" \ COMPOSER_HOME="$workdir/.composer" \
# php${phpversion} "$workdir/composer.phar" $commands \ php${phpversion} "$workdir/composer.phar" $commands \
# -d "$workdir" --quiet --no-interaction -d "$workdir" --quiet --no-interaction
# } }
# # Install and initialize Composer in the given directory # Install and initialize Composer in the given directory
# # #
# # usage: ynh_install_composer [--phpversion=phpversion] [--workdir=$final_path] [--install_args="--optimize-autoloader"] [--composerversion=composerversion] # usage: ynh_install_composer [--phpversion=phpversion] [--workdir=$final_path] [--install_args="--optimize-autoloader"] [--composerversion=composerversion]
# # | arg: -v, --phpversion - PHP version to use with composer # | arg: -v, --phpversion - PHP version to use with composer
# # | arg: -w, --workdir - The directory from where the command will be executed. Default $final_path. # | arg: -w, --workdir - The directory from where the command will be executed. Default $final_path.
# # | arg: -a, --install_args - Additional arguments provided to the composer install. Argument --no-dev already include # | arg: -a, --install_args - Additional arguments provided to the composer install. Argument --no-dev already include
# # | arg: -c, --composerversion - Composer version to install # | arg: -c, --composerversion - Composer version to install
# ynh_install_composer () { ynh_install_composer () {
# # Declare an array to define the options of this helper. # Declare an array to define the options of this helper.
# local legacy_args=vwa local legacy_args=vwa
# declare -Ar args_array=( [v]=phpversion= [w]=workdir= [a]=install_args= [c]=composerversion=) declare -Ar args_array=( [v]=phpversion= [w]=workdir= [a]=install_args= [c]=composerversion=)
# local phpversion local phpversion
# local workdir local workdir
# local install_args local install_args
# local composerversion local composerversion
# # Manage arguments with getopts # Manage arguments with getopts
# ynh_handle_getopts_args "$@" ynh_handle_getopts_args "$@"
# workdir="${workdir:-$final_path}" workdir="${workdir:-$final_path}"
# phpversion="${phpversion:-$YNH_PHP_VERSION}" phpversion="${phpversion:-$YNH_PHP_VERSION}"
# install_args="${install_args:-}" install_args="${install_args:-}"
# composerversion="${composerversion:-$YNH_COMPOSER_VERSION}" composerversion="${composerversion:-$YNH_COMPOSER_VERSION}"
# curl -sS https://getcomposer.org/installer \ curl -sS https://getcomposer.org/installer \
# | COMPOSER_HOME="$workdir/.composer" \ | COMPOSER_HOME="$workdir/.composer" \
# php${phpversion} -- --quiet --install-dir="$workdir" --version=$composerversion \ php${phpversion} -- --quiet --install-dir="$workdir" --version=$composerversion \
# || ynh_die "Unable to install Composer." || ynh_die "Unable to install Composer."
# # update dependencies to create composer.lock # update dependencies to create composer.lock
# ynh_composer_exec --phpversion="${phpversion}" --workdir="$workdir" --commands="install --no-dev $install_args" \ ynh_composer_exec --phpversion="${phpversion}" --workdir="$workdir" --commands="install --no-dev $install_args" \
# || ynh_die "Unable to update core dependencies with Composer." || ynh_die "Unable to update core dependencies with Composer."
# } }

6
scripts/install
View file

@ -131,11 +131,7 @@ ynh_store_file_checksum --file="$final_path/config/db.inc.php"
# Install PHP dependencies using composer # Install PHP dependencies using composer
#================================================= #=================================================
pushd $final_path ynh_install_composer --phpversion="$phpversion" --workdir="$final_path"
export COMPOSER_HOME=$final_path
ynh_exec_warn_less curl -sS https://getcomposer.org/installer | php${phpversion} -- --version="1.10.16" --install-dir="$final_path" \
&& php${phpversion} composer.phar install --no-interaction --quiet
popd
#================================================= #=================================================
# SETUP SYSTEMD # SETUP SYSTEMD

6
scripts/upgrade
View file

@ -153,11 +153,7 @@ yunohost service add $app --description="Responsive web-based XMPP client" --log
# INSTALL PHP DEPENDENCIES USING COMPOSER # INSTALL PHP DEPENDENCIES USING COMPOSER
#================================================= #=================================================
pushd "$final_path" ynh_install_composer --phpversion="$phpversion" --workdir="$final_path"
ynh_exec_warn_less curl -sS https://getcomposer.org/installer | php$phpversion -- --version="2.0.9" --install-dir="$final_path" \
&& php$phpversion composer.phar config --global discard-changes true --quiet \
&& php$phpversion composer.phar install --no-interaction --quiet
popd
#================================================= #=================================================
# Set-up database # Set-up database