1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/etherpad_mypads_ynh.git synced 2024-09-03 18:36:09 +02:00

Fix linter warning

This commit is contained in:
ericgaspar 2021-09-28 23:27:43 +02:00
parent 5a16e4cd74
commit 54ee286a76
No known key found for this signature in database
GPG key ID: 574F281483054D44
5 changed files with 7 additions and 19 deletions

View file

@ -13,7 +13,6 @@
"website": "http://etherpad.org",
"demo": "https://video.etherpad.com",
"admindoc": "http://etherpad.org/doc/v1.8.14",
"userdoc": "https://yunohost.org/en/app_etherpad_mypads",
"code": "https://github.com/ether/etherpad-lite"
},
"license": "Apache-2.0",
@ -37,8 +36,7 @@
"install" : [
{
"name": "domain",
"type": "domain",
"example": "sub.domain.org"
"type": "domain"
},
{
"name": "path",
@ -48,13 +46,11 @@
},
{
"name": "admin",
"type": "user",
"example": "john"
"type": "user"
},
{
"name": "password",
"type": "password",
"example": "Choose a password"
"type": "password"
},
{
"name": "language",

View file

@ -4,8 +4,6 @@
# COMMON VARIABLES
#=================================================
#!/bin/bash
# Dependencies for AbiWord
abiword_app_depencencies="abiword"

View file

@ -32,7 +32,7 @@ ynh_abort_if_errors
domain=$YNH_APP_ARG_DOMAIN
path_url=$YNH_APP_ARG_PATH
admin=$YNH_APP_ARG_ADMIN
ynh_print_OFF; password=$YNH_APP_ARG_PASSWORD; ynh_print_ON
password=$YNH_APP_ARG_PASSWORD
language=$YNH_APP_ARG_LANGUAGE
is_public=$YNH_APP_ARG_IS_PUBLIC
export=$YNH_APP_ARG_EXPORT
@ -46,12 +46,10 @@ app=$YNH_APP_INSTANCE_NAME
#=================================================
ynh_script_progression --message="Validating installation parameters..."
ynh_print_OFF
if [ "${#password}" -lt 8 ] || [ "${#password}" -gt 30 ]
then
ynh_die --message="The password must be between 8 and 30 characters."
fi
ynh_print_ON
final_path=/var/www/$app
test ! -e "$final_path" || ynh_die --message="This path already contains a folder"
@ -67,7 +65,7 @@ ynh_script_progression --message="Storing installation settings..." --weight=3
ynh_app_setting_set --app=$app --key=domain --value=$domain
ynh_app_setting_set --app=$app --key=path --value=$path_url
ynh_app_setting_set --app=$app --key=admin --value=$admin
ynh_print_OFF; ynh_app_setting_set --app=$app --key=password --value=$password; ynh_print_ON
ynh_app_setting_set --app=$app --key=password --value=$password
ynh_app_setting_set --app=$app --key=language --value=$language
ynh_app_setting_set --app=$app --key=export --value=$export
ynh_app_setting_set --app=$app --key=mypads --value=$mypads
@ -344,7 +342,6 @@ else
Informations="You can access the admin panel by accessing https://$domain${path_url%/}/admin."
fi
ynh_print_OFF
echo "$Informations
You can also find a config file for Etherpad at this path /var/www/etherpad_mypads/settings.json.
@ -354,7 +351,6 @@ You can also find some specific actions for this app by using the experimental a
If you are facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/etherpad_mypads_ynh" > mail_to_send
ynh_send_readme_to_admin --app_message="mail_to_send" --recipients="$admin" --type=install
ynh_print_ON
#=================================================
# END OF SCRIPT

View file

@ -35,7 +35,7 @@ db_name=$(ynh_app_setting_get --app=$app --key=db_name)
export=$(ynh_app_setting_get --app=$app --key=export)
mypads=$(ynh_app_setting_get --app=$app --key=mypads)
admin=$(ynh_app_setting_get --app=$app --key=admin)
ynh_print_OFF; password=$(ynh_app_setting_get --app=$app --key=password); ynh_print_ON
password=$(ynh_app_setting_get --app=$app --key=password)
#=================================================
# CHECK IF THE APP CAN BE RESTORED
@ -191,14 +191,12 @@ else
Informations="You can access to the admin panel, by accessing https://$domain${path_url%/}/admin."
fi
ynh_print_OFF
echo "$Informations
You can also find a config file for Etherpad at this path /var/www/etherpad_mypads/settings.json.
If you are facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/etherpad_mypads_ynh" > mail_to_send
ynh_send_readme_to_admin --app_message="mail_to_send" --recipients="$admin" --type=restore
ynh_print_ON
#=================================================
# END OF SCRIPT

View file

@ -27,7 +27,7 @@ export=$(ynh_app_setting_get --app=$app --key=export)
db_name=$(ynh_app_setting_get --app=$app --key=db_name)
db_user=$db_name
db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
ynh_print_OFF; password=$(ynh_app_setting_get --app=$app --key=password); ynh_print_ON
password=$(ynh_app_setting_get --app=$app --key=password)
mypads=$(ynh_app_setting_get --app=$app --key=mypads)
useldap=$(ynh_app_setting_get --app=$app --key=useldap)
overwrite_settings=$(ynh_app_setting_get --app=$app --key=overwrite_settings)