From 414f6b7ad6fb04a579185f6cb621d60de838a220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Fri, 26 Apr 2024 22:00:58 +0200 Subject: [PATCH] Use = intead of space for helper args to avoid issue with parameter --- scripts/backup | 10 +++++----- scripts/install | 4 ++-- scripts/restore | 2 +- scripts/upgrade | 18 +++++++++--------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/scripts/backup b/scripts/backup index f55ce8a..27468e1 100644 --- a/scripts/backup +++ b/scripts/backup @@ -19,23 +19,23 @@ fi ynh_print_info --message='Declaring files to be backed up...' # Copy the app source files -ynh_backup --src_path "$install_dir" +ynh_backup --src_path="$install_dir" # Copy the data files -ynh_backup --src_path "$data_dir" --is_big=1 +ynh_backup --src_path="$data_dir" --is_big=1 # Copy the conf files -ynh_backup --src_path "/etc/nginx/conf.d/$domain.d/$app.conf" +ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_backup --src_path="/etc/fail2ban/jail.d/$app.conf" ynh_backup --src_path="/etc/fail2ban/filter.d/$app.conf" ynh_backup --src_path="/etc/logrotate.d/$app" -ynh_backup --src_path "/etc/systemd/system/$app.service" +ynh_backup --src_path="/etc/systemd/system/$app.service" # Backup logs -ynh_backup --src_path "/var/log/$app" +ynh_backup --src_path="/var/log/$app" # Dump the database ynh_print_info --message="Backing up the MySQL database" diff --git a/scripts/install b/scripts/install index 8ed9a0d..41504b4 100644 --- a/scripts/install +++ b/scripts/install @@ -50,7 +50,7 @@ jwt_secret=$(ynh_exec_as "$app" "$install_dir/gitea" generate secret JWT_SECRET) ynh_app_setting_set --app="$app" --key=internal_token --value="$internal_token" ynh_app_setting_set --app="$app" --key=secret_key --value="$secret_key" ynh_app_setting_set --app="$app" --key=lfs_jwt_secret --value="$lfs_jwt_secret" -ynh_app_setting_set --app "$app" --key jwt_secret --value="$jwt_secret" +ynh_app_setting_set --app="$app" --key=jwt_secret --value="$jwt_secret" ynh_add_config --template='app.ini' --destination="$install_dir/custom/conf/app.ini" @@ -69,7 +69,7 @@ ynh_add_systemd_config yunohost service add "$app" --log="/var/log/$app/gitea.log" # Configure logrotate -ynh_use_logrotate --logfile "/var/log/$app" +ynh_use_logrotate --logfile="/var/log/$app" # Create a dedicated Fail2Ban config ynh_add_fail2ban_config --logpath="/var/log/$app/gitea.log" --failregex='.*Failed authentication attempt for .* from ' --max_retry=5 diff --git a/scripts/restore b/scripts/restore index 1fd0b31..32211bb 100644 --- a/scripts/restore +++ b/scripts/restore @@ -34,7 +34,7 @@ yunohost service add "$app" --log="/var/log/$app/gitea.log" # SETUP FAIL2BAN ynh_script_progression --message="Configuring fail2ban..." -ynh_add_fail2ban_config --logpath "/var/log/$app/gitea.log" --failregex ".*Failed authentication attempt for .* from " --max_retry 5 +ynh_add_fail2ban_config --logpath="/var/log/$app/gitea.log" --failregex=".*Failed authentication attempt for .* from " --max_retry=5 #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index ab25c56..746115d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -18,11 +18,11 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= ynh_script_progression --message='Ensuring downward compatibility...' --weight=1 -if ynh_compare_current_package_version --comparison lt --version "1.6.4~ynh1"; then +if ynh_compare_current_package_version --comparison=lt --version="1.6.4~ynh1"; then message="Upgrade from $YNH_APP_CURRENT_VERSION was dropped. You need to run this, then upgrade to the latest version: sudo yunohost app upgrade $app -u https://github.com/YunoHost-Apps/gitea_ynh/commit/a9ceb157032ae2290e944c1d0a255451ff2d133d" ynh_print_info "$message" - ynh_die --message="$message" --ret_code 1 + ynh_die --message="$message" --ret_code=1 fi #================================================= @@ -71,28 +71,28 @@ chmod +x "$install_dir/gitea" if [[ -z "${internal_token:-}" ]]; then internal_token=$(ynh_exec_as "$app" "$install_dir/gitea" generate secret INTERNAL_TOKEN) - ynh_app_setting_set --app "$app" --key internal_token --value="$internal_token" + ynh_app_setting_set --app="$app" --key=internal_token --value="$internal_token" fi if [[ -z "${secret_key:-}" ]]; then secret_key=$(ynh_exec_as "$app" "$install_dir/gitea" generate secret SECRET_KEY) - ynh_app_setting_set --app "$app" --key secret_key --value="$secret_key" + ynh_app_setting_set --app="$app" --key=secret_key --value="$secret_key" fi if [[ -n "${lfs_key:-}" ]]; then lfs_jwt_secret="$lfs_key" - ynh_app_setting_delete --app "$app" --key lfs_key - ynh_app_setting_set --app "$app" --key lfs_jwt_secret --value="$lfs_jwt_secret" + ynh_app_setting_delete --app="$app" --key=lfs_key + ynh_app_setting_set --app="$app" --key=lfs_jwt_secret --value="$lfs_jwt_secret" fi if [[ -z "${lfs_jwt_secret:-}" ]]; then lfs_jwt_secret=$(ynh_exec_as "$app" "$install_dir/gitea" generate secret JWT_SECRET) - ynh_app_setting_set --app "$app" --key lfs_jwt_secret --value="$lfs_jwt_secret" + ynh_app_setting_set --app="$app" --key=lfs_jwt_secret --value="$lfs_jwt_secret" fi if [[ -z "${jwt_secret:-}" ]]; then jwt_secret=$(ynh_exec_as "$app" "$install_dir/gitea" generate secret JWT_SECRET) - ynh_app_setting_set --app "$app" --key jwt_secret --value="$jwt_secret" + ynh_app_setting_set --app="$app" --key=jwt_secret --value="$jwt_secret" fi #================================================= @@ -141,7 +141,7 @@ yunohost service add "$app" --log="/var/log/$app/gitea.log" ynh_use_logrotate --non-append -ynh_add_fail2ban_config --logpath="/var/log/$app/gitea.log" --failregex=".*Failed authentication attempt for .* from " --max_retry 5 +ynh_add_fail2ban_config --logpath="/var/log/$app/gitea.log" --failregex=".*Failed authentication attempt for .* from " --max_retry=5 #================================================= # START SYSTEMD SERVICE