From 02de615d477edb570687910e0e683d1ab073fe13 Mon Sep 17 00:00:00 2001 From: farvardin Date: Thu, 23 Apr 2020 13:06:01 +0200 Subject: [PATCH] remove db_name reference --- scripts/backup | 2 +- scripts/install | 7 ++++--- scripts/remove | 4 ++-- scripts/restore | 4 ++-- scripts/upgrade | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/scripts/backup b/scripts/backup index 074218e..f726440 100644 --- a/scripts/backup +++ b/scripts/backup @@ -30,7 +30,7 @@ app=$YNH_APP_INSTANCE_NAME final_path=$(ynh_app_setting_get --app=$app --key=final_path) domain=$(ynh_app_setting_get --app=$app --key=domain) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) +# db_name=$(ynh_app_setting_get --app=$app --key=db_name) #================================================= # STANDARD BACKUP STEPS diff --git a/scripts/install b/scripts/install index fd4e536..03a1fb5 100644 --- a/scripts/install +++ b/scripts/install @@ -1,5 +1,6 @@ #!/bin/bash +# Lionwiki-t2t for YunoHost #================================================= # GENERIC START #================================================= @@ -191,8 +192,8 @@ cp ../conf/minimaxing.css $final_path/templates/minimaxing/minimaxing_org.css # Set the password ynh_replace_string --match_string="__YNH_PASSWORD__" --replace_string="$password" --target_file="$final_path/config.php" -# Set the "admin" user (not used, admin password = user password) -#ynh_replace_string --match_string="__YNH_ADMINPASSWORD__" --replace_string="$password" --target_file="$final_path/config.php" +# Set the "admin" user (not used, admin password = user password, you can modify it later) +# ynh_replace_string --match_string="__YNH_ADMINPASSWORD__" --replace_string="$password" --target_file="$final_path/config.php" ynh_replace_string --match_string="__YNH_LANG__" --replace_string="$language" --target_file="$final_path/config.php" @@ -202,6 +203,7 @@ ynh_replace_string --match_string="__YNH_LABEL__" --replace_string="$wiki" -- #ynh_replace_string --match_string="__YNH_COLOR__" --replace_string="$color" --target_file="$final_path/templates/minimaxing/minimaxing.less" # test if the color was correctly set (6 hexadecimal values) +# if not, we'll use a default grey color (#555555) if echo "$color" | grep -q -E '[A-Fa-f0-9]{6}' then @@ -217,7 +219,6 @@ lessc $final_path/templates/minimaxing/minimaxing.less > $final_path/templates/m - #ynh_replace_string --match_string="__YNH_COLOR__" --replace_string="$color" --target_file="$final_path/templates/minimaxing/minimaxing.css" diff --git a/scripts/remove b/scripts/remove index 7c5e20a..605343e 100644 --- a/scripts/remove +++ b/scripts/remove @@ -18,8 +18,8 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) port=$(ynh_app_setting_get --app=$app --key=port) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) -db_user=$db_name +#db_name=$(ynh_app_setting_get --app=$app --key=db_name) +#db_user=$db_name final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= diff --git a/scripts/restore b/scripts/restore index 99fafcd..6dec45f 100644 --- a/scripts/restore +++ b/scripts/restore @@ -31,8 +31,8 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) -db_user=$db_name +#db_name=$(ynh_app_setting_get --app=$app --key=db_name) +#db_user=$db_name #================================================= # CHECK IF THE APP CAN BE RESTORED diff --git a/scripts/upgrade b/scripts/upgrade index 21dc7c2..7f89680 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -22,7 +22,7 @@ admin=$(ynh_app_setting_get --app=$app --key=admin) is_public=$(ynh_app_setting_get --app=$app --key=is_public) final_path=$(ynh_app_setting_get --app=$app --key=final_path) language=$(ynh_app_setting_get --app=$app --key=language) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) +#db_name=$(ynh_app_setting_get --app=$app --key=db_name) #================================================= # CHECK VERSION