From 422e02244de866babf9f6327f69e7a213c3d93e8 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 27 May 2024 20:20:12 +0200 Subject: [PATCH] helpers 2.1: fix indent --- helpers/helpers.v2.1.d/apps | 146 ++++++++++++++++++------------------ 1 file changed, 73 insertions(+), 73 deletions(-) diff --git a/helpers/helpers.v2.1.d/apps b/helpers/helpers.v2.1.d/apps index e4d7f90ca..c010dab2b 100644 --- a/helpers/helpers.v2.1.d/apps +++ b/helpers/helpers.v2.1.d/apps @@ -125,89 +125,89 @@ ynh_remove_apps() { # from the app's service configuration file (defaults to $app.service, overridable by the packager with `service` setting). # If the app relies on a specific PHP version, then `php` will be aliased that version. The PHP command will also be appended with the `phpflags` settings. ynh_spawn_app_shell() { - # ============ Argument parsing ============= - local -A args_array=([a]=app=) - local app - ynh_handle_getopts_args "$@" - # =========================================== + # ============ Argument parsing ============= + local -A args_array=([a]=app=) + local app + ynh_handle_getopts_args "$@" + # =========================================== - # Force Bash to be used to run this helper - if [[ ! $0 =~ \/?bash$ ]] - then - ynh_print_err --message="Please use Bash as shell" - exit 1 - fi + # Force Bash to be used to run this helper + if [[ ! $0 =~ \/?bash$ ]] + then + ynh_print_err --message="Please use Bash as shell" + exit 1 + fi - # Make sure the app is installed - local installed_apps_list=($(yunohost app list --output-as json --quiet | jq -r .apps[].id)) - if [[ " ${installed_apps_list[*]} " != *" ${app} "* ]] - then - ynh_print_err --message="$app is not in the apps list" - exit 1 - fi + # Make sure the app is installed + local installed_apps_list=($(yunohost app list --output-as json --quiet | jq -r .apps[].id)) + if [[ " ${installed_apps_list[*]} " != *" ${app} "* ]] + then + ynh_print_err --message="$app is not in the apps list" + exit 1 + fi - # Make sure the app has its own user - if ! id -u "$app" &>/dev/null; then - ynh_print_err --message="There is no \"$app\" system user" - exit 1 - fi + # Make sure the app has its own user + if ! id -u "$app" &>/dev/null; then + ynh_print_err --message="There is no \"$app\" system user" + exit 1 + fi - # Make sure the app has an install_dir setting - local install_dir=$(ynh_app_setting_get --key=install_dir) - if [ -z "$install_dir" ] - then - ynh_print_err --message="$app has no install_dir setting (does it use packaging format >=2?)" - exit 1 - fi + # Make sure the app has an install_dir setting + local install_dir=$(ynh_app_setting_get --key=install_dir) + if [ -z "$install_dir" ] + then + ynh_print_err --message="$app has no install_dir setting (does it use packaging format >=2?)" + exit 1 + fi - # Load the app's service name, or default to $app - local service=$(ynh_app_setting_get --key=service) - [ -z "$service" ] && service=$app; + # Load the app's service name, or default to $app + local service=$(ynh_app_setting_get --key=service) + [ -z "$service" ] && service=$app; - # Export HOME variable - export HOME=$install_dir; + # Export HOME variable + export HOME=$install_dir; - # Load the Environment variables from the app's service - local env_var=$(systemctl show $service.service -p "Environment" --value) - [ -n "$env_var" ] && export $env_var; + # Load the Environment variables from the app's service + local env_var=$(systemctl show $service.service -p "Environment" --value) + [ -n "$env_var" ] && export $env_var; - # Force `php` to its intended version - # We use `eval`+`export` since `alias` is not propagated to subshells, even with `export` - local phpversion=$(ynh_app_setting_get --key=phpversion) - local phpflags=$(ynh_app_setting_get --key=phpflags) - if [ -n "$phpversion" ] - then - eval "php() { php${phpversion} ${phpflags} \"\$@\"; }" - export -f php - fi + # Force `php` to its intended version + # We use `eval`+`export` since `alias` is not propagated to subshells, even with `export` + local phpversion=$(ynh_app_setting_get --key=phpversion) + local phpflags=$(ynh_app_setting_get --key=phpflags) + if [ -n "$phpversion" ] + then + eval "php() { php${phpversion} ${phpflags} \"\$@\"; }" + export -f php + fi - # Source the EnvironmentFiles from the app's service - local env_files=($(systemctl show $service.service -p "EnvironmentFiles" --value)) - if [ ${#env_files[*]} -gt 0 ] - then - # set -/+a enables and disables new variables being automatically exported. Needed when using `source`. - set -a - for file in ${env_files[*]} - do - [[ $file = /* ]] && source $file - done - set +a - fi + # Source the EnvironmentFiles from the app's service + local env_files=($(systemctl show $service.service -p "EnvironmentFiles" --value)) + if [ ${#env_files[*]} -gt 0 ] + then + # set -/+a enables and disables new variables being automatically exported. Needed when using `source`. + set -a + for file in ${env_files[*]} + do + [[ $file = /* ]] && source $file + done + set +a + fi - # Activate the Python environment, if it exists - if [ -f $install_dir/venv/bin/activate ] - then - # set -/+a enables and disables new variables being automatically exported. Needed when using `source`. - set -a - source $install_dir/venv/bin/activate - set +a - fi + # Activate the Python environment, if it exists + if [ -f $install_dir/venv/bin/activate ] + then + # set -/+a enables and disables new variables being automatically exported. Needed when using `source`. + set -a + source $install_dir/venv/bin/activate + set +a + fi - # cd into the WorkingDirectory set in the service, or default to the install_dir - local env_dir=$(systemctl show $service.service -p "WorkingDirectory" --value) - [ -z $env_dir ] && env_dir=$install_dir; - cd $env_dir + # cd into the WorkingDirectory set in the service, or default to the install_dir + local env_dir=$(systemctl show $service.service -p "WorkingDirectory" --value) + [ -z $env_dir ] && env_dir=$install_dir; + cd $env_dir - # Spawn the app shell - su -s /bin/bash $app + # Spawn the app shell + su -s /bin/bash $app }