From 9a02bc4bc97f693655897d7ca03f378d960b90a1 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 19 Sep 2021 08:33:36 +0200 Subject: [PATCH] cleaning up --- check_process | 2 -- manifest.json | 8 +++----- scripts/backup | 2 +- scripts/change_url | 4 ++-- scripts/install | 4 ++-- scripts/remove | 6 +++--- scripts/restore | 2 +- scripts/upgrade | 6 +++--- 8 files changed, 15 insertions(+), 19 deletions(-) diff --git a/check_process b/check_process index 25f6bb5..6493356 100644 --- a/check_process +++ b/check_process @@ -23,5 +23,3 @@ Notification=none ;;; Upgrade options ; commit=2a54cd03f90c93b07150a64644ffc7f208110a18 name=update to 4.10.0 - - \ No newline at end of file diff --git a/manifest.json b/manifest.json index 5e3db52..5f6e030 100644 --- a/manifest.json +++ b/manifest.json @@ -4,7 +4,7 @@ "packaging_format": 1, "description": { "en": "Zero Knowledge realtime collaborative editor", - "fr": "Éditeur chiffré collaboratif en temps réel." + "fr": "Éditeur chiffré collaboratif en temps réel" }, "version": "4.11.0~ynh1", "url": "https://cryptpad.fr/", @@ -36,13 +36,11 @@ "help": { "en": "CryptPad needs to be installed in a dedicated domain or sub-domain.", "fr": "CryptPad doit être installé dans un domaine ou sous-domaine dédié." - }, - "example": "cryptpad.example.com" + } }, { "name": "admin", - "type": "user", - "example": "johndoe" + "type": "user" }, { "name": "is_public", diff --git a/scripts/backup b/scripts/backup index 240b707..c6c42c3 100644 --- a/scripts/backup +++ b/scripts/backup @@ -57,4 +57,4 @@ ynh_backup --src_path="/etc/systemd/system/$app.service" # END OF SCRIPT #================================================= -ynh_print_info --message="Backup script completed for CryptPad. (YunoHost will then actually copy those files to the archive)." +ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." diff --git a/scripts/change_url b/scripts/change_url index 6c5d113..4dff8ab 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -32,7 +32,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up CryptPad before changing its URL (may take a while)..." --weight=2 +ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=2 # Backup the current version of the app ynh_backup_before_upgrade @@ -120,4 +120,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Change of URL completed for CryptPad" --last +ynh_script_progression --message="Change of URL completed for $app" --last diff --git a/scripts/install b/scripts/install index 976e493..23c4c4d 100644 --- a/scripts/install +++ b/scripts/install @@ -122,7 +122,7 @@ chown $app "$final_path/config/config.js" #================================================= # INSTALL CRYPTPAD #================================================= -ynh_script_progression --message="Building CryptPad... (this will take some time and resources!)" --weight=60 +ynh_script_progression --message="Building $app... (this will take some time and resources!)" --weight=60 pushd "$final_path" ynh_use_nodejs @@ -191,4 +191,4 @@ ynh_send_readme_to_admin "$message" # END OF SCRIPT #================================================= -ynh_script_progression --message="Installation of CryptPad completed" --last +ynh_script_progression --message="Installation of $app completed" --last diff --git a/scripts/remove b/scripts/remove index 8ae9496..a9e6f33 100644 --- a/scripts/remove +++ b/scripts/remove @@ -29,7 +29,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) # Remove the service from the list of services known by YunoHost (added from `yunohost service add`) if ynh_exec_warn_less yunohost service status $app >/dev/null then - ynh_script_progression --message="Removing CryptPad service..." --weight=3 + ynh_script_progression --message="Removing $app service..." --weight=3 yunohost service remove $app fi @@ -51,7 +51,7 @@ ynh_remove_nodejs #================================================= # REMOVE APP MAIN DIR #================================================= -ynh_script_progression --message="Removing CryptPad main directory..." --weight=3 +ynh_script_progression --message="Removing $app main directory..." --weight=3 # Remove the app directory securely ynh_secure_remove --file="$final_path" @@ -78,4 +78,4 @@ ynh_system_user_delete --username=$app # END OF SCRIPT #================================================= -ynh_script_progression --message="Removal of CryptPad completed" --last +ynh_script_progression --message="Removal of $app completed" --last diff --git a/scripts/restore b/scripts/restore index aada9cb..ad1593c 100644 --- a/scripts/restore +++ b/scripts/restore @@ -111,4 +111,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Restoration completed for CryptPad" --last +ynh_script_progression --message="Restoration completed for $app" --last diff --git a/scripts/upgrade b/scripts/upgrade index 5578f0d..0cafe05 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -51,7 +51,7 @@ fi #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up CryptPad before upgrading (may take a while)..." --weight=1 +ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=1 # Backup the current version of the app ynh_backup_before_upgrade @@ -120,7 +120,7 @@ ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version #================================================= # INSTALL CRYPTPAD #================================================= -ynh_script_progression --message="Building CryptPad... (this will take some time and resources!)" --weight=60 +ynh_script_progression --message="Building $app... (this will take some time and resources!)" --weight=60 pushd "$final_path" ynh_exec_warn_less npm install --allow-root @@ -164,4 +164,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Upgrade of CryptPad completed" --last +ynh_script_progression --message="Upgrade of $app completed" --last