Fix args for some helpers

This commit is contained in:
Josué Tille 2019-10-01 21:34:41 +02:00
parent 3a66c7b87b
commit 10e8930fab
No known key found for this signature in database
GPG Key ID: 716A6C99B04194EF
4 changed files with 7 additions and 7 deletions

View File

@ -19,7 +19,7 @@ ynh_script_progression --message="Loading installation settings..."
# RETRIEVE ARGUMENTS # RETRIEVE ARGUMENTS
old_domain=$YNH_APP_OLD_DOMAIN old_domain=$YNH_APP_OLD_DOMAIN
domain=$YNH_APP_NEW_DOMAIN domain=$YNH_APP_NEW_DOMAIN
path_url=$(ynh_normalize_url_path ${YNH_APP_NEW_PATH:-'/'}) path_url=$(ynh_normalize_url_path --path_url ${YNH_APP_NEW_PATH:-'/'})
app=$YNH_APP_INSTANCE_NAME app=$YNH_APP_INSTANCE_NAME
dbpass=$(ynh_app_setting_get --app $app --key mysqlpwd) dbpass=$(ynh_app_setting_get --app $app --key mysqlpwd)

View File

@ -18,7 +18,7 @@ ynh_script_progression --message="Validating installation parameters..."
# Retrieve arguments # Retrieve arguments
domain=$YNH_APP_ARG_DOMAIN domain=$YNH_APP_ARG_DOMAIN
path_url=$(ynh_normalize_url_path $YNH_APP_ARG_PATH) path_url=$(ynh_normalize_url_path --path_url $YNH_APP_ARG_PATH)
admin=$YNH_APP_ARG_ADMIN admin=$YNH_APP_ARG_ADMIN
is_public=$YNH_APP_ARG_IS_PUBLIC is_public=$YNH_APP_ARG_IS_PUBLIC
upstream_version=$(ynh_app_upstream_version) upstream_version=$(ynh_app_upstream_version)
@ -39,7 +39,7 @@ dbpass=$(ynh_string_random)
key=$(ynh_string_random) key=$(ynh_string_random)
# Find available ports # Find available ports
port=$(ynh_find_port 6000) port=$(ynh_find_port --port 6000)
# Store Settings # Store Settings
ynh_script_progression --message="Storing installation settings..." ynh_script_progression --message="Storing installation settings..."
@ -119,7 +119,7 @@ yunohost service add "$app" --log "/var/log/$app/gitea.log"
# Configure logrotate # Configure logrotate
ynh_script_progression --message="Configuring log rotation..." ynh_script_progression --message="Configuring log rotation..."
ynh_use_logrotate "/var/log/$app" ynh_use_logrotate --logfile "/var/log/$app"
# Save Version # Save Version
ynh_app_setting_set --app $app --key upstream_version --value $(ynh_app_upstream_version) ynh_app_setting_set --app $app --key upstream_version --value $(ynh_app_upstream_version)

View File

@ -25,7 +25,7 @@ port=$(ynh_app_setting_get --app $app --key web_port)
upstream_version=$(ynh_app_setting_get $app upstream_version) upstream_version=$(ynh_app_setting_get $app upstream_version)
# Check domain/path availability with app helper # Check domain/path availability with app helper
ynh_webpath_available $domain $path_url || ynh_die --message "$domain is not available as domain, please use an other domain." ynh_webpath_available --domain $domain --path_url $path_url || ynh_die --message "$domain is not available as domain, please use an other domain."
# Check user parameter # Check user parameter
ynh_user_exists "$admin" \ ynh_user_exists "$admin" \
@ -69,7 +69,7 @@ set_permission
# Configure logrotate # Configure logrotate
ynh_script_progression --message="Configuring log rotation..." ynh_script_progression --message="Configuring log rotation..."
ynh_use_logrotate "/var/log/$app" ynh_use_logrotate --logfile "/var/log/$app"
# Add gitea to YunoHost's monitored services # Add gitea to YunoHost's monitored services
ynh_script_progression --message="Register gitea service..." ynh_script_progression --message="Register gitea service..."

View File

@ -17,7 +17,7 @@ source ./_common.sh
# Retrieve app settings # Retrieve app settings
ynh_script_progression --message="Loading installation settings..." ynh_script_progression --message="Loading installation settings..."
domain=$(ynh_app_setting_get --app $app --key domain) domain=$(ynh_app_setting_get --app $app --key domain)
path_url=$(ynh_normalize_url_path $(ynh_app_setting_get --app $app --key path)) path_url=$(ynh_normalize_url_path --path_url $(ynh_app_setting_get --app $app --key path))
dbpass=$(ynh_app_setting_get --app $app --key mysqlpwd) dbpass=$(ynh_app_setting_get --app $app --key mysqlpwd)
admin=$(ynh_app_setting_get --app $app --key adminusername) admin=$(ynh_app_setting_get --app $app --key adminusername)
key=$(ynh_app_setting_get --app $app --key secret_key) key=$(ynh_app_setting_get --app $app --key secret_key)