From 6dc8a249a2245399270fc2f585baa1e2be414d9d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 16 Jan 2022 20:56:38 +0100 Subject: [PATCH 1/3] remove final_path --- scripts/install | 1 - scripts/remove | 5 ----- 2 files changed, 6 deletions(-) diff --git a/scripts/install b/scripts/install index 6ffb8b4..4920b83 100755 --- a/scripts/install +++ b/scripts/install @@ -23,7 +23,6 @@ is_public=$YNH_APP_ARG_IS_PUBLIC # Set variable path_url="/SOGo" -# final_path="/opt/yunohost/$app" # Register (book) web path ynh_webpath_register --app $app --domain $domain --path_url $path_url diff --git a/scripts/remove b/scripts/remove index 13e6b77..4af7a19 100755 --- a/scripts/remove +++ b/scripts/remove @@ -19,7 +19,6 @@ 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=$(ynh_app_setting_get --app $app --key db_user) -final_path=$(ynh_app_setting_get --app $app --key final_path) #================================================= # STANDARD REMOVE @@ -33,10 +32,6 @@ ynh_remove_app_dependencies ynh_script_progression --message="Removing databases..." ynh_mysql_remove_db --db_user $db_user --db_name $db_name -# Remove the app directory securely -ynh_script_progression --message="Removing user data..." -ynh_secure_remove --file="$final_path" - ynh_script_progression --message="Removing configuration..." # Remove sogo config From eebce77031c9b351ef4d32f6c786bd1081f9be7c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 16 Jan 2022 20:57:35 +0100 Subject: [PATCH 2/3] Update check_process --- check_process | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/check_process b/check_process index 0a909a8..5ae8b13 100644 --- a/check_process +++ b/check_process @@ -5,12 +5,10 @@ ;; Test complet ; Manifest - domain="domain.tld" (DOMAIN) - path="/SOGo" (PATH) - admin="john" (USER) - language="French" - is_public=1 (PUBLIC|public=1|private=0) - port="20000" (PORT) + domain="domain.tld" + path="/SOGo" + admin="john" + is_public=1 ; Checks pkg_linter=1 setup_sub_dir=1 @@ -22,8 +20,6 @@ upgrade=1 from_commit=cc07f5da79498ef948c31a99f6ace9ad0a5b9ec1 backup_restore=1 multi_instance=0 - incorrect_path=1 - port_already_use=1 (8448) change_url=0 ;;; Upgrade options ; commit=cc07f5da79498ef948c31a99f6ace9ad0a5b9ec1 From 287b9b0d568366ba0c031b03e0c3c56ab5b36e04 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 16 Jan 2022 21:01:28 +0100 Subject: [PATCH 3/3] Fix more linter --- scripts/change_url | 3 +-- scripts/restore | 7 +------ scripts/upgrade | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index 1813e6b..5af4643 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -19,12 +19,11 @@ ynh_script_progression --message="Loading installation settings..." # RETRIEVE ARGUMENTS old_domain=$YNH_APP_OLD_DOMAIN domain=$YNH_APP_NEW_DOMAIN -path_url=$(ynh_normalize_url_path --path_url $YNH_APP_NEW_PATH) +path_url=$YNH_APP_NEW_PATH app=$YNH_APP_INSTANCE_NAME port=$(ynh_app_setting_get --app $app --key web_port) admin=$(ynh_app_setting_get --app $app --key admin) -final_path=$(ynh_app_setting_get --app $app --key final_path) # Check if the new path stay /SOGo if not exit diff --git a/scripts/restore b/scripts/restore index 4731326..4b084cb 100755 --- a/scripts/restore +++ b/scripts/restore @@ -18,12 +18,8 @@ ynh_script_progression --message="Loading settings..." 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) - -# CHECK IF THE APP CAN BE RESTORED -ynh_webpath_available --domain $domain --path_url $path_url \ - || ynh_die --message "Path not available: ${domain}${path_url}" +db_user=$db_name #================================================= # STANDARD RESTORATION STEPS @@ -39,7 +35,6 @@ ynh_restore # RESTORE THE MYSQL DATABASE ynh_script_progression --message="Restoring database..." --weight=3 -db_user=$db_name db_pwd=$(ynh_app_setting_get --app $app --key mysqlpwd) ynh_mysql_setup_db --db_name $db_name --db_user $db_user --db_pwd $db_pwd ynh_mysql_connect_as --user $db_user --password $db_pwd --database $db_name < ./db.sql diff --git a/scripts/upgrade b/scripts/upgrade index c7e1e23..d01d50e 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -23,7 +23,7 @@ admin=$(ynh_app_setting_get --app $app --key admin) port=$(ynh_app_setting_get --app $app --key web_port) smtp_port=$(ynh_app_setting_get --app $app --key smtp_port) db_name=$(ynh_app_setting_get --app $app --key db_name) -db_user=$(ynh_app_setting_get --app $app --key db_user) +db_user=$db_name db_pwd=$(ynh_app_setting_get --app $app --key mysqlpwd) # Backup the current version of the app