From 99cb36cdccf458fa792991dd33ef44e96e78d118 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Holcroft Date: Fri, 27 Oct 2017 11:09:29 +0200 Subject: [PATCH] Use admin mail and add a little bit of cleanup --- scripts/install | 28 +++++++++++++------------- scripts/restore | 3 +-- scripts/upgrade | 52 +++++++++++++++++++++++++++---------------------- 3 files changed, 44 insertions(+), 39 deletions(-) diff --git a/scripts/install b/scripts/install index 0ac85b4..2de4c54 100644 --- a/scripts/install +++ b/scripts/install @@ -37,12 +37,12 @@ final_path=/var/www/$app test ! -e "$final_path" || ynh_die "This path already contains a folder" # Normalize the url path syntax -path_url=$(ynh_normalize_url_path $path_url) +path_url=$(ynh_normalize_url_path "$path_url") # Check web path availability -ynh_webpath_available $domain $path_url +ynh_webpath_available "$domain" "$path_url" # Register (book) web path -ynh_webpath_register $app $domain $path_url +ynh_webpath_register "$app" "$domain" "$path_url" #================================================= # STORE SETTINGS FROM MANIFEST @@ -53,7 +53,6 @@ ynh_app_setting_set "$app" path_url "$path_url" ynh_app_setting_set "$app" admin "$admin" ynh_app_setting_set "$app" language "$language" ynh_app_setting_set "$app" is_public "$is_public" -ynh_app_setting_set "$app" public_site "$is_public" #================================================= # STANDARD MODIFICATIONS @@ -111,22 +110,23 @@ ynh_add_fpm_config #================================================= config="$final_path/app/inc/config.php" -cp ../conf/config.php $config +admin_mail=$(ynh_user_get_info "$admin" mail) +cp ../conf/config.php "$config" # Change variables in configuration -ynh_replace_string "__DBUSER__" "$dbuser" $config -ynh_replace_string "__DBPWD__" "$dbpass" $config -ynh_replace_string "__DBNAME__" "$db_name" $config -ynh_replace_string "__ADMINMAIL__" "$admin" $config -ynh_replace_string "__LANGUAGE__" "$language" $config -ynh_replace_string "__DOMAIN__" "$domain" $config -ynh_replace_string "__PATH__" "$path_url" $config +ynh_replace_string "__DBUSER__" "$dbuser" "$config" +ynh_replace_string "__DBPWD__" "$dbpass" "$config" +ynh_replace_string "__DBNAME__" "$db_name" "$config" +ynh_replace_string "__ADMINMAIL__" "$admin_mail" "$config" +ynh_replace_string "__LANGUAGE__" "$language" "$config" +ynh_replace_string "__DOMAIN__" "$domain" "$config" +ynh_replace_string "__PATH__" "$path_url" "$config" #================================================= # Replace logo image (default is FramaDate) #================================================= -cp ../img/logo.png $final_path/images +cp ../img/logo.png "$final_path/images" #================================================= # STORE THE CHECKSUM OF THE CONFIG FILE @@ -140,7 +140,7 @@ ynh_store_file_checksum "$config" #================================================= # Create log file -touch $final_path/admin/stdout.log +touch "$final_path/admin/stdout.log" #================================================= diff --git a/scripts/restore b/scripts/restore index ed8c71e..33da250 100644 --- a/scripts/restore +++ b/scripts/restore @@ -33,7 +33,6 @@ domain=$(ynh_app_setting_get "$app" domain) path_url=$(ynh_app_setting_get "$app" path) admin=$(ynh_app_setting_get "$app" admin) is_public=$(ynh_app_setting_get "$app" is_public) -public_site=$(ynh_app_setting_get "$app" public_site) db_name=$(ynh_app_setting_get "$app" db_name) dbuser=$app final_path=$(ynh_app_setting_get "$app" final_path) @@ -42,7 +41,7 @@ final_path=$(ynh_app_setting_get "$app" final_path) # CHECK IF THE APP CAN BE RESTORED #================================================ -ynh_webpath_available $domain $path_url \ +ynh_webpath_available "$domain" "$path_url" \ || ynh_die "Path not available: ${domain}${path_url}" test ! -d $final_path \ || ynh_die "There is already a directory: $final_path" diff --git a/scripts/upgrade b/scripts/upgrade index b152c15..9176f97 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -26,43 +26,49 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get "$app" domain) path_url=$(ynh_app_setting_get "$app" path) admin=$(ynh_app_setting_get "$app" admin) -public_site=$(ynh_app_setting_get "$app" public_site) is_public=$(ynh_app_setting_get "$app" is_public) -db_name=$(ynh_app_setting_get $app db_name) +db_name=$(ynh_app_setting_get "$app" db_name) dbuser=$app dbpass=$(ynh_app_setting_get "$app" mysqlpwd) final_path=$(ynh_app_setting_get "$app" final_path) +language=$(ynh_app_setting_get "$app" language) #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= +if [ -z "$is_public" ]; +then + is_public=$(ynh_app_setting_get "$app" public_site) + ynh_app_setting_set "$app" is_public "$is_public" + ynh_app_setting_delete "$app" public_site +fi + # Fix is_public as a boolean value if [ "$is_public" = "Yes" ]; then - ynh_app_setting_set $app is_public 1 + ynh_app_setting_set "$app" is_public 1 is_public=1 elif [ "$is_public" = "No" ]; then - ynh_app_setting_set $app is_public 0 + ynh_app_setting_set "$app" is_public 0 is_public=0 fi # If db_name doesn't exist, create it -if [ -z $db_name ]; then - db_name=$(ynh_sanitize_dbid $app) - ynh_app_setting_set $app db_name $db_name +if [ -z "$db_name" ]; then + db_name=$(ynh_sanitize_dbid "$app") + ynh_app_setting_set "$app" db_name "$db_name" fi # If final_path doesn't exist, create it -if [ -z $final_path ]; then +if [ -z "$final_path" ]; then final_path=/var/www/$app - ynh_app_setting_set $app final_path $final_path + ynh_app_setting_set "$app" final_path "$final_path" fi # make sure default language is set -language=$(ynh_app_setting_get "$app" language) -if [[ "$language" = "" ]]; +if [ -z "$language" ]; then - language=$(grep LANGUE /var/www/$app/variables.php | grep -Po "'.*?'" | cut -d"'" -f2) + language=$(grep LANGUE "/var/www/$app/variables.php" | grep -Po "'.*?'" | cut -d"'" -f2) fi #================================================= @@ -83,10 +89,10 @@ ynh_abort_if_errors #================================================= # Normalize the URL path syntax -path_url=$(ynh_normalize_url_path $path_url) +path_url=$(ynh_normalize_url_path "$path_url") # Check web path availability -ynh_webpath_available $domain $path_url +ynh_webpath_available "$domain" "$path_url" #================================================= # STANDARD UPGRADE STEPS @@ -125,16 +131,16 @@ ynh_add_fpm_config #================================================= config="$final_path/app/inc/config.php" -cp ../conf/config.php $config +cp ../conf/config.php "$config" # Change variables in configuration -ynh_replace_string "__DBUSER__" "$dbuser" $config -ynh_replace_string "__DBPWD__" "$dbpass" $config -ynh_replace_string "__DBNAME__" "$db_name" $config -ynh_replace_string "__ADMINMAIL__" "$admin" $config -ynh_replace_string "__LANGUAGE__" "$language" $config -ynh_replace_string "__DOMAIN__" "$domain" $config -ynh_replace_string "__PATH__" "$path_url" $config +ynh_replace_string "__DBUSER__" "$dbuser" "$config" +ynh_replace_string "__DBPWD__" "$dbpass" "$config" +ynh_replace_string "__DBNAME__" "$db_name" "$config" +ynh_replace_string "__ADMINMAIL__" "$admin" "$config" +ynh_replace_string "__LANGUAGE__" "$language" "$config" +ynh_replace_string "__DOMAIN__" "$domain" "$config" +ynh_replace_string "__PATH__" "$path_url" "$config" #================================================= # Replace logo image (default is FramaDate) @@ -156,7 +162,7 @@ ynh_store_file_checksum "$config" #================================================= # Create log file -touch $final_path/admin/stdout.log +touch "$final_path/admin/stdout.log" #================================================= # GENERIC FINALIZATION