From 44ff9d23c22dc7121fd734edb7105e25ff22cb08 Mon Sep 17 00:00:00 2001
From: mhfowler <maxhfowler@gmail.com>
Date: Thu, 19 Aug 2021 14:28:29 +0200
Subject: [PATCH 1/9] Add port to change_url

---
 scripts/change_url | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/change_url b/scripts/change_url
index bc7e2af..6f2e8a1 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -28,6 +28,7 @@ ynh_script_progression --message="Loading installation settings..." --time --wei
 
 # Needed for helper "ynh_add_nginx_config"
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+port=$(ynh_app_setting_get --app=$app --key=port)
 
 
 #=================================================

From bcf32b2bb9442a613fcb972692ea74f3bcb94def Mon Sep 17 00:00:00 2001
From: mhfowler <maxhfowler@gmail.com>
Date: Thu, 19 Aug 2021 15:53:54 +0200
Subject: [PATCH 2/9] Fix package lint warnings

---
 manifest.json      | 18 +++++------
 scripts/change_url | 14 ++++-----
 scripts/install    | 74 ++++++++++++++++------------------------------
 scripts/remove     | 22 +++++++-------
 scripts/restore    | 28 +++++++++---------
 scripts/upgrade    | 32 ++++++++++----------
 6 files changed, 83 insertions(+), 105 deletions(-)

diff --git a/manifest.json b/manifest.json
index b02d204..ca69adb 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
     "id": "archivebox",
     "packaging_format": 1,
     "description": {
-        "en": "ArchiveBox is a powerful, self-hosted internet archiving solution to collect, save, and view sites you want to preserve offline.",
+        "en": "A self-hosted internet archiving solution to collect, save, and view sites you want to preserve offline.",
         "fr": ""
     },
     "version": "1.4~ynh1",
@@ -12,8 +12,7 @@
         "license": "MIT",
         "website": "https://archivebox.io/",
         "demo": "https://archiveboxdemo.commoninternet.net",
-        "admindoc": "https://yunohost.org/packaging_apps",
-        "userdoc": "https://yunohost.org/apps",
+        "admindoc": "https://github.com/ArchiveBox/ArchiveBox/wiki",
         "code": "https://github.com/ArchiveBox/ArchiveBox"
     },
     "license": "MIT",
@@ -22,7 +21,7 @@
         "email": "max@mfowler.info"
     },
     "requirements": {
-        "yunohost": ">= 4.1.3"
+        "yunohost": ">= 4.1.7"
     },
     "multi_instance": true,
     "services": [
@@ -43,7 +42,10 @@
             {
                 "name": "is_public",
                 "type": "boolean",
-                "default": true
+                "default": true,
+                "help": {
+                    "en": "If true, saved archives will be viewable without logging in."
+                }
             },
             {
                 "name": "language",
@@ -59,10 +61,8 @@
                 "name": "password",
                 "type": "password",
                 "help": {
-                    "en": "Use the help field to add an information for the admin about this question.",
-                    "fr": "Utilisez le champ aide pour ajouter une information à l'intention de l'administrateur à propos de cette question."
-                },
-                "example": "Choose a password"
+                    "en": "The password used to login as an admin for this app"
+                }
             }
         ]
     }
diff --git a/scripts/change_url b/scripts/change_url
index 6f2e8a1..c003864 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -24,7 +24,7 @@ app=$YNH_APP_INSTANCE_NAME
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading installation settings..." --time --weight=1
+ynh_script_progression --message="Loading installation settings..."  --weight=1
 
 # Needed for helper "ynh_add_nginx_config"
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
@@ -34,7 +34,7 @@ port=$(ynh_app_setting_get --app=$app --key=port)
 #=================================================
 # BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP
 #=================================================
-ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --time --weight=1
+ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..."  --weight=1
 
 # Backup the current version of the app
 ynh_backup_before_upgrade
@@ -69,14 +69,14 @@ fi
 #=================================================
 # STOP SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Stopping a systemd service..." --time --weight=1
+ynh_script_progression --message="Stopping a systemd service..."  --weight=1
 
 ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log"
 
 #=================================================
 # MODIFY URL IN NGINX CONF
 #=================================================
-ynh_script_progression --message="Updating NGINX web server configuration..." --time --weight=1
+ynh_script_progression --message="Updating NGINX web server configuration..."  --weight=1
 
 nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf
 
@@ -107,14 +107,14 @@ fi
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Starting a systemd service..." --time --weight=1
+ynh_script_progression --message="Starting a systemd service..."  --weight=1
 
 ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
 
 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_script_progression --message="Reloading NGINX web server..." --time --weight=1
+ynh_script_progression --message="Reloading NGINX web server..."  --weight=1
 
 ynh_systemd_action --service_name=nginx --action=reload
 
@@ -122,4 +122,4 @@ ynh_systemd_action --service_name=nginx --action=reload
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Change of URL completed for $app" --time --last
+ynh_script_progression --message="Change of URL completed for $app"  --last
diff --git a/scripts/install b/scripts/install
index 531ddb9..c339983 100755
--- a/scripts/install
+++ b/scripts/install
@@ -48,20 +48,18 @@ admin_mail=$(ynh_user_get_info $admin 'mail')
 ### db names...
 app=$YNH_APP_INSTANCE_NAME
 
-ynh_script_progression --message="INFO: $YNH_STDINFO" --time --weight=1
-
 #=================================================
 # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
 #=================================================
-### About --weight and --time
+### About --weight and
 ### ynh_script_progression will show to your final users the progression of each scripts.
 ### In order to do that, --weight will represent the relative time of execution compared to the other steps in the script.
-### --time is a packager option, it will show you the execution time since the previous call.
+###  is a packager option, it will show you the execution time since the previous call.
 ### This option should be removed before releasing your app.
-### Use the execution time, given by --time, to estimate the weight of a step.
+### Use the execution time, given by , to estimate the weight of a step.
 ### A common way to do it is to set a weight equal to the execution time in second +1.
 ### The execution time is given for the duration since the previous call. So the weight should be applied to this previous call.
-ynh_script_progression --message="Validating installation parameters..." --time --weight=1
+ynh_script_progression --message="Validating installation parameters..."  --weight=1
 
 ### If the app uses NGINX as web server (written in HTML/PHP in most cases), the final path should be "/var/www/$app".
 ### If the app provides an internal web server (or uses another application server such as uWSGI), the final path should be "/opt/yunohost/$app"
@@ -74,7 +72,7 @@ ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
 #=================================================
 # STORE SETTINGS FROM MANIFEST
 #=================================================
-ynh_script_progression --message="Storing installation settings..." --time --weight=1
+ynh_script_progression --message="Storing installation settings..."  --weight=1
 
 ynh_app_setting_set --app=$app --key=domain --value=$domain
 ynh_app_setting_set --app=$app --key=path --value=$path_url
@@ -86,48 +84,31 @@ ynh_app_setting_set --app=$app --key=language --value=$language
 #=================================================
 # FIND AND OPEN A PORT
 #=================================================
-ynh_script_progression --message="Finding an available port..." --time --weight=1
-
-### Use these lines if you have to open a port for the application
-### `ynh_find_port` will find the first available port starting from the given port.
-### If you're not using these lines:
-###		- Remove the section "CLOSE A PORT" in the remove script
+ynh_script_progression --message="Finding an available port..."  --weight=1
 
 # Find an available port
 port=$(ynh_find_port --port=8095)
 ynh_app_setting_set --app=$app --key=port --value=$port
 
-# Optional: Expose this port publicly
-# (N.B.: you only need to do this if the app actually needs to expose the port publicly.
-# If you do this and the app doesn't actually need you are CREATING SECURITY HOLES IN THE SERVER !)
-# TODO: test without this line
-# Open the port
-ynh_script_progression --message="Configuring firewall..." --time --weight=1
-ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $port
-
 #=================================================
 # INSTALL DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Installing dependencies..." --time --weight=1
+ynh_script_progression --message="Installing dependencies..."  --weight=1
 
 ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # CREATE DEDICATED USER
 #=================================================
-ynh_script_progression --message="Configuring system user..." --time --weight=1
+ynh_script_progression --message="Configuring system user..."  --weight=1
 
 # Create a system user
 ynh_system_user_create --username=$app --home_dir="$final_path"
 
 #=================================================
-# DOWNLOAD, CHECK AND UNPACK SOURCE
+# CREATE FINAL_PATH FOLDER
 #=================================================
-ynh_script_progression --message="Setting up source files..." --time --weight=1
-
-### `ynh_setup_source` is used to install an app from a zip or tar.gz file,
-### downloaded from an upstream source, like a git repository.
-### `ynh_setup_source` use the file conf/app.src
+ynh_script_progression --message="Setting up source files..."  --weight=1
 
 ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 # Download, check integrity, uncompress and patch the source from app.src
@@ -147,10 +128,9 @@ chown -R $app:www-data "$final_path"
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring NGINX web server..." --time --weight=1
+ynh_script_progression --message="Configuring NGINX web server..."  --weight=1
 
 ### `ynh_add_nginx_config` will use the file conf/nginx.conf
-
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
@@ -164,9 +144,7 @@ ynh_script_progression --message="Install project via pip..." --weight=80
 
 python3 -m venv "${final_path}/venv"
 cp ../conf/requirements.txt "$final_path/requirements.txt"
-cp ../conf/start.sh "$final_path/start.sh"
-ynh_replace_string "__FINALPATH__"  "$final_path" "$final_path/start.sh"
-ynh_replace_string "__PORT__"  "$port" "$final_path/start.sh"
+ynh_add_config --template="../conf/start.sh" --destination="$final_path/start.sh"
 chmod 760 "$final_path/start.sh"
 chown -R "$app" "$final_path"
 
@@ -182,7 +160,7 @@ chown -R "$app" "$final_path"
 #=================================================
 # CREATE DATA DIRECTORY
 #=================================================
-ynh_script_progression --message="Creating a data directory..." --time --weight=1
+ynh_script_progression --message="Creating a data directory..."  --weight=1
 
 datadir=/home/yunohost.app/$app
 ynh_app_setting_set --app=$app --key=datadir --value=$datadir
@@ -198,16 +176,16 @@ chown -R $app:www-data "$datadir"
 #=================================================
 # INITIALIZE ARCHIVEBOX
 #=================================================
-ynh_script_progression --message="Initializing Archivebox" --time --weight=1
+ynh_script_progression --message="Initializing Archivebox"  --weight=1
 cd $datadir && ynh_exec_as $app archivebox init
 
-ynh_script_progression --message="Checking if admin superuser already exists: $admin" --time --weight=1
+ynh_script_progression --message="Checking if admin superuser already exists: $admin"  --weight=1
 USER_EXISTS=$(cd $datadir && ynh_exec_as $app archivebox manage shell -c "from django.contrib.auth.models import User; print(User.objects.filter(username='$admin').count())")
-ynh_script_progression --message="Found users: $USER_EXISTS" --time --weight=1
+ynh_script_progression --message="Found users: $USER_EXISTS"  --weight=1
 
 if [ $USER_EXISTS -eq 1 ]
 then
-    ynh_script_progression --message="User already exists: setting admin password" --time --weight=1
+    ynh_script_progression --message="User already exists: setting admin password"  --weight=1
 ynh_exec_as $app /usr/bin/expect<<EOF
 set force_conservative 0  ;
 set timeout -1
@@ -220,7 +198,7 @@ send -- "$password\r"
 expect eof
 EOF
 else
-    ynh_script_progression --message="Creating new archivebox superuser: $admin" --time --weight=1
+    ynh_script_progression --message="Creating new archivebox superuser: $admin"  --weight=1
     ynh_exec_as $app /usr/bin/expect<<EOF
 set force_conservative 0  ;
 set timeout -1
@@ -234,7 +212,7 @@ expect eof
 EOF
 fi
 
-ynh_script_progression --message="Finishing Archivebox Setup" --time --weight=1
+ynh_script_progression --message="Finishing Archivebox Setup"  --weight=1
 cd $datadir && ynh_exec_as $app archivebox init --setup
 
 #=================================================
@@ -246,7 +224,7 @@ cd $datadir && ynh_exec_as $app archivebox init --setup
 #=================================================
 # SETUP SYSTEMD
 #=================================================
-ynh_script_progression --message="Configuring a systemd service..." --time --weight=1
+ynh_script_progression --message="Configuring a systemd service..."  --weight=1
 
 # Create a dedicated systemd config
 ynh_add_systemd_config
@@ -256,7 +234,7 @@ ynh_add_systemd_config
 #=================================================
 # SETUP LOGROTATE
 #=================================================
-ynh_script_progression --message="Configuring log rotation..." --time --weight=1
+ynh_script_progression --message="Configuring log rotation..."  --weight=1
 
 # Use logrotate to manage application logfile(s)
 ynh_use_logrotate
@@ -264,14 +242,14 @@ ynh_use_logrotate
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST
 #=================================================
-ynh_script_progression --message="Integrating service in YunoHost..." --time --weight=1
+ynh_script_progression --message="Integrating service in YunoHost..."  --weight=1
 
 yunohost service add $app --description="Self-hosted internet archiving" --log="/var/log/$app/$app.log"
 
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Starting a systemd service..." --time --weight=1
+ynh_script_progression --message="Starting a systemd service..."  --weight=1
 
 # Start a systemd service
 ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
@@ -279,7 +257,7 @@ ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$ap
 #=================================================
 # SETUP SSOWAT
 #=================================================
-ynh_script_progression --message="Configuring permissions..." --time --weight=1
+ynh_script_progression --message="Configuring permissions..."  --weight=1
 
 # Make app public if necessary
 if [ $is_public -eq 1 ]
@@ -292,7 +270,7 @@ fi
 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_script_progression --message="Reloading NGINX web server..." --time --weight=1
+ynh_script_progression --message="Reloading NGINX web server..."  --weight=1
 
 ynh_systemd_action --service_name=nginx --action=reload
 
@@ -300,4 +278,4 @@ ynh_systemd_action --service_name=nginx --action=reload
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Installation of $app completed" --time --last
+ynh_script_progression --message="Installation of $app completed"  --last
diff --git a/scripts/remove b/scripts/remove
index 1f8455c..7a9e653 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading installation settings..." --time --weight=1
+ynh_script_progression --message="Loading installation settings..."  --weight=1
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -31,14 +31,14 @@ 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 $app service integration..." --time --weight=1
+	ynh_script_progression --message="Removing $app service integration..."  --weight=1
 	yunohost service remove $app
 fi
 
 #=================================================
 # STOP AND REMOVE SERVICE
 #=================================================
-ynh_script_progression --message="Stopping and removing the systemd service..." --time --weight=1
+ynh_script_progression --message="Stopping and removing the systemd service..."  --weight=1
 
 # Remove the dedicated systemd config
 ynh_remove_systemd_config
@@ -46,7 +46,7 @@ ynh_remove_systemd_config
 #=================================================
 # REMOVE DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Removing dependencies..." --time --weight=1
+ynh_script_progression --message="Removing dependencies..."  --weight=1
 
 # Remove metapackage and its dependencies
 ynh_remove_app_dependencies
@@ -54,7 +54,7 @@ ynh_remove_app_dependencies
 #=================================================
 # REMOVE APP MAIN DIR
 #=================================================
-ynh_script_progression --message="Removing app main directory..." --time --weight=1
+ynh_script_progression --message="Removing app main directory..."  --weight=1
 
 # Remove the app directory securely
 ynh_secure_remove --file="$final_path"
@@ -62,7 +62,7 @@ ynh_secure_remove --file="$final_path"
 #=================================================
 # REMOVE NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Removing NGINX web server configuration..." --time --weight=1
+ynh_script_progression --message="Removing NGINX web server configuration..."  --weight=1
 
 # Remove the dedicated NGINX config
 ynh_remove_nginx_config
@@ -70,7 +70,7 @@ ynh_remove_nginx_config
 #=================================================
 # REMOVE LOGROTATE CONFIGURATION
 #=================================================
-ynh_script_progression --message="Removing logrotate configuration..." --time --weight=1
+ynh_script_progression --message="Removing logrotate configuration..."  --weight=1
 
 # Remove the app-specific logrotate config
 ynh_remove_logrotate
@@ -81,7 +81,7 @@ ynh_remove_logrotate
 
 if yunohost firewall list | grep -q "\- $port$"
 then
-	ynh_script_progression --message="Closing port $port..." --time --weight=1
+	ynh_script_progression --message="Closing port $port..."  --weight=1
 	ynh_exec_warn_less yunohost firewall disallow TCP $port
 fi
 
@@ -90,7 +90,7 @@ fi
 #=================================================
 # REMOVE VARIOUS FILES
 #=================================================
-ynh_script_progression --message="Removing various files..." --time --weight=1
+ynh_script_progression --message="Removing various files..."  --weight=1
 
 # Remove the log files
 ynh_secure_remove --file="/var/log/$app"
@@ -100,7 +100,7 @@ ynh_secure_remove --file="/var/log/$app"
 #=================================================
 # REMOVE DEDICATED USER
 #=================================================
-ynh_script_progression --message="Removing the dedicated system user..." --time --weight=1
+ynh_script_progression --message="Removing the dedicated system user..."  --weight=1
 
 # Delete a system user
 ynh_system_user_delete --username=$app
@@ -109,4 +109,4 @@ ynh_system_user_delete --username=$app
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Removal of $app completed" --time --last
+ynh_script_progression --message="Removal of $app completed"  --last
diff --git a/scripts/restore b/scripts/restore
index 3fa6b7f..40f6948 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -24,7 +24,7 @@ ynh_abort_if_errors
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading installation settings..." --time --weight=1
+ynh_script_progression --message="Loading installation settings..."  --weight=1
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -36,7 +36,7 @@ datadir=$(ynh_app_setting_get --app=$app --key=datadir)
 #=================================================
 # CHECK IF THE APP CAN BE RESTORED
 #=================================================
-ynh_script_progression --message="Validating restoration parameters..." --time --weight=1
+ynh_script_progression --message="Validating restoration parameters..."  --weight=1
 
 ynh_webpath_available --domain=$domain --path_url=$path_url \
 	|| ynh_die --message="Path not available: ${domain}${path_url}"
@@ -48,14 +48,14 @@ test ! -d $final_path \
 #=================================================
 # RESTORE THE NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Restoring the NGINX configuration..." --time --weight=1
+ynh_script_progression --message="Restoring the NGINX configuration..."  --weight=1
 
 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
 #=================================================
 # RECREATE THE DEDICATED USER
 #=================================================
-ynh_script_progression --message="Recreating the dedicated system user..." --time --weight=1
+ynh_script_progression --message="Recreating the dedicated system user..."  --weight=1
 
 # Create the dedicated user (if not existing)
 ynh_system_user_create --username=$app --home_dir="$final_path"
@@ -63,7 +63,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path"
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
-ynh_script_progression --message="Restoring the app main directory..." --time --weight=1
+ynh_script_progression --message="Restoring the app main directory..."  --weight=1
 
 ynh_restore_file --origin_path="$final_path"
 
@@ -80,7 +80,7 @@ chown -R $app:www-data "$final_path"
 #=================================================
 # RESTORE THE DATA DIRECTORY
 #=================================================
-ynh_script_progression --message="Restoring the data directory..." --time --weight=1
+ynh_script_progression --message="Restoring the data directory..."  --weight=1
 
 ynh_restore_file --origin_path="$datadir" --not_mandatory
 
@@ -101,7 +101,7 @@ chown -R $app:www-data "$datadir"
 #=================================================
 # REINSTALL DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Reinstalling dependencies..." --time --weight=1
+ynh_script_progression --message="Reinstalling dependencies..."  --weight=1
 
 # Define and install dependencies
 ynh_install_app_dependencies $pkg_dependencies
@@ -109,7 +109,7 @@ ynh_install_app_dependencies $pkg_dependencies
 #=================================================
 # RESTORE SYSTEMD
 #=================================================
-ynh_script_progression --message="Restoring the systemd configuration..." --time --weight=1
+ynh_script_progression --message="Restoring the systemd configuration..."  --weight=1
 
 ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
 systemctl enable $app.service --quiet
@@ -117,21 +117,21 @@ systemctl enable $app.service --quiet
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST
 #=================================================
-ynh_script_progression --message="Integrating service in YunoHost..." --time --weight=1
+ynh_script_progression --message="Integrating service in YunoHost..."  --weight=1
 
-yunohost service add $app --description="A short description of the app" --log="/var/log/$app/$app.log"
+yunohost service add $app --description="Self-hosted internet archiving" --log="/var/log/$app/$app.log"
 
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Starting a systemd service..." --time --weight=1
+ynh_script_progression --message="Starting a systemd service..."  --weight=1
 
 ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
 
 #=================================================
 # RESTORE THE LOGROTATE CONFIGURATION
 #=================================================
-ynh_script_progression --message="Restoring the logrotate configuration..." --time --weight=1
+ynh_script_progression --message="Restoring the logrotate configuration..."  --weight=1
 
 ynh_restore_file --origin_path="/etc/logrotate.d/$app"
 
@@ -140,7 +140,7 @@ ynh_restore_file --origin_path="/etc/logrotate.d/$app"
 #=================================================
 # RELOAD NGINX AND PHP-FPM
 #=================================================
-ynh_script_progression --message="Reloading NGINX" --time --weight=1
+ynh_script_progression --message="Reloading NGINX"  --weight=1
 
 ynh_systemd_action --service_name=nginx --action=reload
 
@@ -148,4 +148,4 @@ ynh_systemd_action --service_name=nginx --action=reload
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Restoration completed for $app" --time --last
+ynh_script_progression --message="Restoration completed for $app"  --last
diff --git a/scripts/upgrade b/scripts/upgrade
index 00ffe1e..a2be581 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading installation settings..." --time --weight=1
+ynh_script_progression --message="Loading installation settings..."  --weight=1
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -41,7 +41,7 @@ upgrade_type=$(ynh_check_app_version_changed)
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
 #=================================================
-ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --time --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
@@ -57,14 +57,14 @@ ynh_abort_if_errors
 #=================================================
 # STOP SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Stopping a systemd service..." --time --weight=1
+ynh_script_progression --message="Stopping a systemd service..."  --weight=1
 
 ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log"
 
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
 #=================================================
-ynh_script_progression --message="Ensuring downward compatibility..." --time --weight=1
+ynh_script_progression --message="Ensuring downward compatibility..."  --weight=1
 
 # Cleaning legacy permissions
 if ynh_legacy_permissions_exists; then
@@ -76,7 +76,7 @@ fi
 #=================================================
 # CREATE DEDICATED USER
 #=================================================
-ynh_script_progression --message="Making sure dedicated system user exists..." --time --weight=1
+ynh_script_progression --message="Making sure dedicated system user exists..."  --weight=1
 
 # Create a dedicated user (if not existing)
 ynh_system_user_create --username=$app --home_dir="$final_path"
@@ -89,7 +89,7 @@ datadir=/home/yunohost.app/$app
 
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
-	ynh_script_progression --message="Upgrading via pip" --time --weight=1
+	ynh_script_progression --message="Upgrading via pip"  --weight=1
     python3 -m venv "${final_path}/venv"
     cp ../conf/requirements.txt "$final_path/requirements.txt"
     chown -R "$app" "$final_path"
@@ -104,7 +104,7 @@ then
     )
 
     # rerun archivebox setup (its idempotent, so it should be ok during upgrade)
-    ynh_script_progression --message="Finishing Archivebox Setup" --time --weight=1
+    ynh_script_progression --message="Finishing Archivebox Setup"  --weight=1
     cd $datadir && ynh_exec_as $app archivebox init --setup
 fi
 
@@ -121,7 +121,7 @@ chown -R $app:www-data "$final_path"
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Upgrading NGINX web server configuration..." --time --weight=1
+ynh_script_progression --message="Upgrading NGINX web server configuration..."  --weight=1
 
 # Create a dedicated NGINX config
 ynh_add_nginx_config
@@ -129,7 +129,7 @@ ynh_add_nginx_config
 #=================================================
 # UPGRADE DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Upgrading dependencies..." --time --weight=1
+ynh_script_progression --message="Upgrading dependencies..."  --weight=1
 
 ynh_install_app_dependencies $pkg_dependencies
 
@@ -142,7 +142,7 @@ ynh_install_app_dependencies $pkg_dependencies
 #=================================================
 # SETUP SYSTEMD
 #=================================================
-ynh_script_progression --message="Upgrading systemd configuration..." --time --weight=1
+ynh_script_progression --message="Upgrading systemd configuration..."  --weight=1
 
 # Create a dedicated systemd config
 ynh_add_systemd_config
@@ -152,7 +152,7 @@ ynh_add_systemd_config
 #=================================================
 # SETUP LOGROTATE
 #=================================================
-ynh_script_progression --message="Upgrading logrotate configuration..." --time --weight=1
+ynh_script_progression --message="Upgrading logrotate configuration..."  --weight=1
 
 # Use logrotate to manage app-specific logfile(s)
 ynh_use_logrotate --non-append
@@ -160,21 +160,21 @@ ynh_use_logrotate --non-append
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST
 #=================================================
-ynh_script_progression --message="Integrating service in YunoHost..." --time --weight=1
+ynh_script_progression --message="Integrating service in YunoHost..."  --weight=1
 
-yunohost service add $app --description="A short description of the app" --log="/var/log/$app/$app.log"
+yunohost service add $app --description="Self-hosted internet archiving" --log="/var/log/$app/$app.log"
 
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Starting a systemd service..." --time --weight=1
+ynh_script_progression --message="Starting a systemd service..."  --weight=1
 
 ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
 
 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_script_progression --message="Reloading NGINX web server..." --time --weight=1
+ynh_script_progression --message="Reloading NGINX web server..."  --weight=1
 
 ynh_systemd_action --service_name=nginx --action=reload
 
@@ -182,4 +182,4 @@ ynh_systemd_action --service_name=nginx --action=reload
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Upgrade of $app completed" --time --last
+ynh_script_progression --message="Upgrade of $app completed"  --last

From 4775e01e622146f81d1e43357c1a26e05f9805cf Mon Sep 17 00:00:00 2001
From: Yunohost-Bot <>
Date: Thu, 19 Aug 2021 13:54:02 +0000
Subject: [PATCH 3/9] Auto-update README

---
 README.md    | 5 ++---
 README_fr.md | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 66627a5..d078387 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 ## Overview
 
-ArchiveBox is a powerful, self-hosted internet archiving solution to collect, save, and view sites you want to preserve offline.
+A self-hosted internet archiving solution to collect, save, and view sites you want to preserve offline.
 
 **Shipped version:** 1.4~ynh1
 
@@ -36,8 +36,7 @@ ArchiveBox is a powerful, self-hosted internet archiving solution to collect, sa
 ## Documentation and resources
 
 * Official app website: https://archivebox.io/
-* Official user documentation: https://yunohost.org/apps
-* Official admin documentation: https://yunohost.org/packaging_apps
+* Official admin documentation: https://github.com/ArchiveBox/ArchiveBox/wiki
 * Upstream app code repository: https://github.com/ArchiveBox/ArchiveBox
 * YunoHost documentation for this app: https://yunohost.org/app_archivebox
 * Report a bug: https://github.com/YunoHost-Apps/archivebox_ynh/issues
diff --git a/README_fr.md b/README_fr.md
index 10d87cd..d30a727 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -32,8 +32,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 ## Documentations et ressources
 
 * Site officiel de l'app : https://archivebox.io/
-* Documentation officielle utilisateur : https://yunohost.org/apps
-* Documentation officielle de l'admin : https://yunohost.org/packaging_apps
+* Documentation officielle de l'admin : https://github.com/ArchiveBox/ArchiveBox/wiki
 * Dépôt de code officiel de l'app : https://github.com/ArchiveBox/ArchiveBox
 * Documentation YunoHost pour cette app : https://yunohost.org/app_archivebox
 * Signaler un bug : https://github.com/YunoHost-Apps/archivebox_ynh/issues

From 91c0c420cdee567262c08b6e19c502d2701c5d67 Mon Sep 17 00:00:00 2001
From: mhfowler <maxhfowler@gmail.com>
Date: Fri, 20 Aug 2021 13:45:31 +0200
Subject: [PATCH 4/9] Change install and upgrade to use archivebox command from
 virtualenv

---
 scripts/install | 13 ++++++++-----
 scripts/upgrade |  5 ++++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/scripts/install b/scripts/install
index c339983..794a7f9 100755
--- a/scripts/install
+++ b/scripts/install
@@ -157,6 +157,9 @@ chown -R "$app" "$final_path"
 	ynh_exec_as $app $final_path/venv/bin/pip install -r "$final_path/requirements.txt"
 )
 
+# we use this virtualenv archivebox for further commands now
+archivebox_cmd="$final_path/venv/bin/archivebox"
+
 #=================================================
 # CREATE DATA DIRECTORY
 #=================================================
@@ -177,10 +180,10 @@ chown -R $app:www-data "$datadir"
 # INITIALIZE ARCHIVEBOX
 #=================================================
 ynh_script_progression --message="Initializing Archivebox"  --weight=1
-cd $datadir && ynh_exec_as $app archivebox init
+cd $datadir && ynh_exec_as $app $archivebox_cmd init
 
 ynh_script_progression --message="Checking if admin superuser already exists: $admin"  --weight=1
-USER_EXISTS=$(cd $datadir && ynh_exec_as $app archivebox manage shell -c "from django.contrib.auth.models import User; print(User.objects.filter(username='$admin').count())")
+USER_EXISTS=$(cd $datadir && ynh_exec_as $app $archivebox_cmd manage shell -c "from django.contrib.auth.models import User; print(User.objects.filter(username='$admin').count())")
 ynh_script_progression --message="Found users: $USER_EXISTS"  --weight=1
 
 if [ $USER_EXISTS -eq 1 ]
@@ -189,7 +192,7 @@ then
 ynh_exec_as $app /usr/bin/expect<<EOF
 set force_conservative 0  ;
 set timeout -1
-spawn sh -c "cd $datadir && archivebox manage changepassword $admin"
+spawn sh -c "cd $datadir && $archivebox_cmd manage changepassword $admin"
 match_max 100000
 expect "*?assword: "
 send -- "$password\r"
@@ -202,7 +205,7 @@ else
     ynh_exec_as $app /usr/bin/expect<<EOF
 set force_conservative 0  ;
 set timeout -1
-spawn sh -c "cd $datadir && archivebox manage createsuperuser --username $admin --email $admin_mail"
+spawn sh -c "cd $datadir && $archivebox_cmd manage createsuperuser --username $admin --email $admin_mail"
 match_max 100000
 expect "*?assword: "
 send -- "$password\r"
@@ -213,7 +216,7 @@ EOF
 fi
 
 ynh_script_progression --message="Finishing Archivebox Setup"  --weight=1
-cd $datadir && ynh_exec_as $app archivebox init --setup
+cd $datadir && ynh_exec_as $app $archivebox_cmd init --setup
 
 #=================================================
 # ADD A CONFIGURATION
diff --git a/scripts/upgrade b/scripts/upgrade
index a2be581..28aa98e 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -103,9 +103,12 @@ then
         ynh_exec_as $app $final_path/venv/bin/pip install -r "$final_path/requirements.txt"
     )
 
+    # we use this virtualenv archivebox for further commands now
+    archivebox_cmd="$final_path/venv/bin/archivebox"
+
     # rerun archivebox setup (its idempotent, so it should be ok during upgrade)
     ynh_script_progression --message="Finishing Archivebox Setup"  --weight=1
-    cd $datadir && ynh_exec_as $app archivebox init --setup
+    cd $datadir && ynh_exec_as $app $archivebox_cmd init --setup
 fi
 
 # FIXME: this should be managed by the core in the future

From fae39011a7806dc337c9f089b1959d2619d3bb67 Mon Sep 17 00:00:00 2001
From: mhfowler <maxhfowler@gmail.com>
Date: Fri, 20 Aug 2021 14:15:37 +0200
Subject: [PATCH 5/9] Test activating virtualenv in install

---
 scripts/install | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/install b/scripts/install
index 794a7f9..fd69bbf 100755
--- a/scripts/install
+++ b/scripts/install
@@ -179,6 +179,11 @@ chown -R $app:www-data "$datadir"
 #=================================================
 # INITIALIZE ARCHIVEBOX
 #=================================================
+(
+set +o nounset
+source "${final_path}/venv/bin/activate"
+set -o nounset
+
 ynh_script_progression --message="Initializing Archivebox"  --weight=1
 cd $datadir && ynh_exec_as $app $archivebox_cmd init
 
@@ -217,6 +222,7 @@ fi
 
 ynh_script_progression --message="Finishing Archivebox Setup"  --weight=1
 cd $datadir && ynh_exec_as $app $archivebox_cmd init --setup
+)
 
 #=================================================
 # ADD A CONFIGURATION

From 4ae13189f65c459b6c0eda9c18f31be594d10ed3 Mon Sep 17 00:00:00 2001
From: mhfowler <maxhfowler@gmail.com>
Date: Sun, 22 Aug 2021 20:37:49 +0200
Subject: [PATCH 6/9] Add youtube-dl nodejs and npm as dependencies

---
 scripts/_common.sh | 3 ++-
 scripts/install    | 8 +-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 026c8d0..52ac426 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -5,7 +5,8 @@
 #=================================================
 
 # dependencies used by the app
-pkg_dependencies="python3-venv expect"
+pkg_dependencies="python3-venv expect youtube-dl nodejs np\
+m"
 
 #=================================================
 # PERSONAL HELPERS
diff --git a/scripts/install b/scripts/install
index fd69bbf..d9d508f 100755
--- a/scripts/install
+++ b/scripts/install
@@ -93,7 +93,7 @@ ynh_app_setting_set --app=$app --key=port --value=$port
 #=================================================
 # INSTALL DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Installing dependencies..."  --weight=1
+ynh_script_progression --message="Installing dependencies..."  --weight=8
 
 ynh_install_app_dependencies $pkg_dependencies
 
@@ -179,11 +179,6 @@ chown -R $app:www-data "$datadir"
 #=================================================
 # INITIALIZE ARCHIVEBOX
 #=================================================
-(
-set +o nounset
-source "${final_path}/venv/bin/activate"
-set -o nounset
-
 ynh_script_progression --message="Initializing Archivebox"  --weight=1
 cd $datadir && ynh_exec_as $app $archivebox_cmd init
 
@@ -222,7 +217,6 @@ fi
 
 ynh_script_progression --message="Finishing Archivebox Setup"  --weight=1
 cd $datadir && ynh_exec_as $app $archivebox_cmd init --setup
-)
 
 #=================================================
 # ADD A CONFIGURATION

From 61ac0169c9bf8765705bbe48534da98edb821208 Mon Sep 17 00:00:00 2001
From: mhfowler <maxhfowler@gmail.com>
Date: Sun, 22 Aug 2021 21:11:43 +0200
Subject: [PATCH 7/9] Change start.sh to source virtualenv

---
 conf/start.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/start.sh b/conf/start.sh
index f506584..c9481eb 100644
--- a/conf/start.sh
+++ b/conf/start.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
-__FINALPATH__/venv/bin/activate
+source __FINALPATH__/venv/bin/activate
 archivebox server __PORT__
\ No newline at end of file

From f6401956491bef5b33530bbf7ccedd8ee7dd373d Mon Sep 17 00:00:00 2001
From: mhfowler <maxhfowler@gmail.com>
Date: Sun, 22 Aug 2021 21:12:39 +0200
Subject: [PATCH 8/9] Change start.sh to use absolute path to archivebox binary

---
 conf/start.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/start.sh b/conf/start.sh
index c9481eb..c9b9d8e 100644
--- a/conf/start.sh
+++ b/conf/start.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 source __FINALPATH__/venv/bin/activate
-archivebox server __PORT__
\ No newline at end of file
+__FINALPATH__/venv/bin/archivebox server __PORT__
\ No newline at end of file

From f34234c6d14c295cb6f95439e289643a26d4ebaf Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Mon, 23 Aug 2021 10:32:06 +0200
Subject: [PATCH 9/9] cleaning up

---
 check_process      |  9 ++------
 scripts/backup     |  5 -----
 scripts/change_url | 12 +++++------
 scripts/install    | 54 +++++++++++-----------------------------------
 scripts/remove     | 10 ---------
 scripts/restore    | 32 +++++++++------------------
 scripts/upgrade    | 42 +++++++++++++-----------------------
 7 files changed, 46 insertions(+), 118 deletions(-)

diff --git a/check_process b/check_process
index fefa192..4c840ad 100644
--- a/check_process
+++ b/check_process
@@ -1,8 +1,3 @@
-# See here for more information
-# https://github.com/YunoHost/package_check#syntax-check_process-file
-
-# Move this file from check_process.default to check_process when you have filled it.
-
 ;; Test complet
 	; Manifest
 		domain="domain.tld"
@@ -14,13 +9,13 @@
 		port="666"
 	; Checks
 		pkg_linter=1
-		setup_sub_dir=1
+		setup_sub_dir=0
 		setup_root=1
 		setup_nourl=0
 		setup_private=1
 		setup_public=1
 		upgrade=1
-		upgrade=1	from_commit=CommitHash
+		#upgrade=1	from_commit=CommitHash
 		backup_restore=1
 		multi_instance=1
 		port_already_use=0
diff --git a/scripts/backup b/scripts/backup
index 01326c1..4ba0b55 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -37,11 +37,6 @@ datadir=$(ynh_app_setting_get --app=$app --key=datadir)
 #=================================================
 ynh_print_info --message="Declaring files to be backed up..."
 
-### N.B. : the following 'ynh_backup' calls are only a *declaration* of what needs
-### to be backuped and not an actual copy of any file. The actual backup that
-### creates and fill the archive with the files happens in the core after this
-### script is called. Hence ynh_backups calls takes basically 0 seconds to run.
-
 #=================================================
 # BACKUP THE APP MAIN DIR
 #=================================================
diff --git a/scripts/change_url b/scripts/change_url
index c003864..c6ac688 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -24,7 +24,7 @@ app=$YNH_APP_INSTANCE_NAME
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading installation settings..."  --weight=1
+ynh_script_progression --message="Loading installation settings..." --weight=1
 
 # Needed for helper "ynh_add_nginx_config"
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
@@ -69,14 +69,14 @@ fi
 #=================================================
 # STOP SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Stopping a systemd service..."  --weight=1
+ynh_script_progression --message="Stopping a systemd service..." --weight=1
 
 ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log"
 
 #=================================================
 # MODIFY URL IN NGINX CONF
 #=================================================
-ynh_script_progression --message="Updating NGINX web server configuration..."  --weight=1
+ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1
 
 nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf
 
@@ -107,14 +107,14 @@ fi
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Starting a systemd service..."  --weight=1
+ynh_script_progression --message="Starting a systemd service..." --weight=1
 
 ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
 
 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_script_progression --message="Reloading NGINX web server..."  --weight=1
+ynh_script_progression --message="Reloading NGINX web server..." --weight=1
 
 ynh_systemd_action --service_name=nginx --action=reload
 
@@ -122,4 +122,4 @@ ynh_systemd_action --service_name=nginx --action=reload
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Change of URL completed for $app"  --last
+ynh_script_progression --message="Change of URL completed for $app" --last
diff --git a/scripts/install b/scripts/install
index d9d508f..e366c20 100755
--- a/scripts/install
+++ b/scripts/install
@@ -36,33 +36,13 @@ password=$YNH_APP_ARG_PASSWORD
 
 admin_mail=$(ynh_user_get_info $admin 'mail')
 
-### If it's a multi-instance app, meaning it can be installed several times independently
-### The id of the app as stated in the manifest is available as $YNH_APP_ID
-### The instance number is available as $YNH_APP_INSTANCE_NUMBER (equals "1", "2"...)
-### The app instance name is available as $YNH_APP_INSTANCE_NAME
-###    - the first time the app is installed, YNH_APP_INSTANCE_NAME = ynhexample
-###    - the second time the app is installed, YNH_APP_INSTANCE_NAME = ynhexample__2
-###    - ynhexample__{N} for the subsequent installations, with N=3,4...
-### The app instance name is probably what interests you most, since this is
-### guaranteed to be unique. This is a good unique identifier to define installation path,
-### db names...
 app=$YNH_APP_INSTANCE_NAME
 
 #=================================================
 # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
 #=================================================
-### About --weight and
-### ynh_script_progression will show to your final users the progression of each scripts.
-### In order to do that, --weight will represent the relative time of execution compared to the other steps in the script.
-###  is a packager option, it will show you the execution time since the previous call.
-### This option should be removed before releasing your app.
-### Use the execution time, given by , to estimate the weight of a step.
-### A common way to do it is to set a weight equal to the execution time in second +1.
-### The execution time is given for the duration since the previous call. So the weight should be applied to this previous call.
 ynh_script_progression --message="Validating installation parameters..."  --weight=1
 
-### If the app uses NGINX as web server (written in HTML/PHP in most cases), the final path should be "/var/www/$app".
-### If the app provides an internal web server (or uses another application server such as uWSGI), the final path should be "/opt/yunohost/$app"
 final_path=/var/www/$app
 test ! -e "$final_path" || ynh_die --message="This path already contains a folder"
 
@@ -84,7 +64,7 @@ ynh_app_setting_set --app=$app --key=language --value=$language
 #=================================================
 # FIND AND OPEN A PORT
 #=================================================
-ynh_script_progression --message="Finding an available port..."  --weight=1
+ynh_script_progression --message="Finding an available port..." --weight=1
 
 # Find an available port
 port=$(ynh_find_port --port=8095)
@@ -93,14 +73,14 @@ ynh_app_setting_set --app=$app --key=port --value=$port
 #=================================================
 # INSTALL DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Installing dependencies..."  --weight=8
+ynh_script_progression --message="Installing dependencies..." --weight=8
 
 ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # CREATE DEDICATED USER
 #=================================================
-ynh_script_progression --message="Configuring system user..."  --weight=1
+ynh_script_progression --message="Configuring system user..." --weight=1
 
 # Create a system user
 ynh_system_user_create --username=$app --home_dir="$final_path"
@@ -115,12 +95,6 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 #ynh_setup_source --dest_dir="$final_path"
 mkdir -p $final_path
 
-# FIXME: this should be managed by the core in the future
-# Here, as a packager, you may have to tweak the ownerhsip/permissions
-# such that the appropriate users (e.g. maybe www-data) can access
-# files in some cases.
-# But FOR THE LOVE OF GOD, do not allow r/x for "others" on the entire folder -
-# this will be treated as a security issue.
 chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"
@@ -130,14 +104,12 @@ chown -R $app:www-data "$final_path"
 #=================================================
 ynh_script_progression --message="Configuring NGINX web server..."  --weight=1
 
-### `ynh_add_nginx_config` will use the file conf/nginx.conf
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
 #=================================================
 # SPECIFIC SETUP
 #=================================================
-#=================================================
 # PIP INSTALLATION
 #=================================================
 ynh_script_progression --message="Install project via pip..." --weight=80
@@ -163,7 +135,7 @@ archivebox_cmd="$final_path/venv/bin/archivebox"
 #=================================================
 # CREATE DATA DIRECTORY
 #=================================================
-ynh_script_progression --message="Creating a data directory..."  --weight=1
+ynh_script_progression --message="Creating a data directory..." --weight=1
 
 datadir=/home/yunohost.app/$app
 ynh_app_setting_set --app=$app --key=datadir --value=$datadir
@@ -175,11 +147,11 @@ chmod 750 "$datadir"
 chmod -R o-rwx "$datadir"
 chown -R $app:www-data "$datadir"
 
-
 #=================================================
 # INITIALIZE ARCHIVEBOX
 #=================================================
-ynh_script_progression --message="Initializing Archivebox"  --weight=1
+ynh_script_progression --message="Initializing Archivebox" --weight=1
+
 cd $datadir && ynh_exec_as $app $archivebox_cmd init
 
 ynh_script_progression --message="Checking if admin superuser already exists: $admin"  --weight=1
@@ -227,7 +199,7 @@ cd $datadir && ynh_exec_as $app $archivebox_cmd init --setup
 #=================================================
 # SETUP SYSTEMD
 #=================================================
-ynh_script_progression --message="Configuring a systemd service..."  --weight=1
+ynh_script_progression --message="Configuring a systemd service..." --weight=1
 
 # Create a dedicated systemd config
 ynh_add_systemd_config
@@ -237,7 +209,7 @@ ynh_add_systemd_config
 #=================================================
 # SETUP LOGROTATE
 #=================================================
-ynh_script_progression --message="Configuring log rotation..."  --weight=1
+ynh_script_progression --message="Configuring log rotation..." --weight=1
 
 # Use logrotate to manage application logfile(s)
 ynh_use_logrotate
@@ -245,14 +217,14 @@ ynh_use_logrotate
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST
 #=================================================
-ynh_script_progression --message="Integrating service in YunoHost..."  --weight=1
+ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
 yunohost service add $app --description="Self-hosted internet archiving" --log="/var/log/$app/$app.log"
 
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Starting a systemd service..."  --weight=1
+ynh_script_progression --message="Starting a systemd service..." --weight=1
 
 # Start a systemd service
 ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
@@ -260,7 +232,7 @@ ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$ap
 #=================================================
 # SETUP SSOWAT
 #=================================================
-ynh_script_progression --message="Configuring permissions..."  --weight=1
+ynh_script_progression --message="Configuring permissions..." --weight=1
 
 # Make app public if necessary
 if [ $is_public -eq 1 ]
@@ -273,7 +245,7 @@ fi
 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_script_progression --message="Reloading NGINX web server..."  --weight=1
+ynh_script_progression --message="Reloading NGINX web server..." --weight=1
 
 ynh_systemd_action --service_name=nginx --action=reload
 
@@ -281,4 +253,4 @@ ynh_systemd_action --service_name=nginx --action=reload
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Installation of $app completed"  --last
+ynh_script_progression --message="Installation of $app completed" --last
diff --git a/scripts/remove b/scripts/remove
index 7a9e653..09a166c 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -75,16 +75,6 @@ ynh_script_progression --message="Removing logrotate configuration..."  --weight
 # Remove the app-specific logrotate config
 ynh_remove_logrotate
 
-#=================================================
-# CLOSE A PORT
-#=================================================
-
-if yunohost firewall list | grep -q "\- $port$"
-then
-	ynh_script_progression --message="Closing port $port..."  --weight=1
-	ynh_exec_warn_less yunohost firewall disallow TCP $port
-fi
-
 #=================================================
 # SPECIFIC REMOVE
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 40f6948..827cae0 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -55,7 +55,7 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 #=================================================
 # RECREATE THE DEDICATED USER
 #=================================================
-ynh_script_progression --message="Recreating the dedicated system user..."  --weight=1
+ynh_script_progression --message="Recreating the dedicated system user..." --weight=1
 
 # Create the dedicated user (if not existing)
 ynh_system_user_create --username=$app --home_dir="$final_path"
@@ -63,16 +63,10 @@ ynh_system_user_create --username=$app --home_dir="$final_path"
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
-ynh_script_progression --message="Restoring the app main directory..."  --weight=1
+ynh_script_progression --message="Restoring the app main directory..." --weight=1
 
 ynh_restore_file --origin_path="$final_path"
 
-# FIXME: this should be managed by the core in the future
-# Here, as a packager, you may have to tweak the ownerhsip/permissions
-# such that the appropriate users (e.g. maybe www-data) can access
-# files in some cases.
-# But FOR THE LOVE OF GOD, do not allow r/x for "others" on the entire folder -
-# this will be treated as a security issue.
 chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"
@@ -80,18 +74,12 @@ chown -R $app:www-data "$final_path"
 #=================================================
 # RESTORE THE DATA DIRECTORY
 #=================================================
-ynh_script_progression --message="Restoring the data directory..."  --weight=1
+ynh_script_progression --message="Restoring the data directory..." --weight=1
 
 ynh_restore_file --origin_path="$datadir" --not_mandatory
 
 mkdir -p $datadir
 
-# FIXME: this should be managed by the core in the future
-# Here, as a packager, you may have to tweak the ownerhsip/permissions
-# such that the appropriate users (e.g. maybe www-data) can access
-# files in some cases.
-# But FOR THE LOVE OF GOD, do not allow r/x for "others" on the entire folder -
-# this will be treated as a security issue.
 chmod 750 "$datadir"
 chmod -R o-rwx "$datadir"
 chown -R $app:www-data "$datadir"
@@ -101,7 +89,7 @@ chown -R $app:www-data "$datadir"
 #=================================================
 # REINSTALL DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Reinstalling dependencies..."  --weight=1
+ynh_script_progression --message="Reinstalling dependencies..." --weight=1
 
 # Define and install dependencies
 ynh_install_app_dependencies $pkg_dependencies
@@ -109,7 +97,7 @@ ynh_install_app_dependencies $pkg_dependencies
 #=================================================
 # RESTORE SYSTEMD
 #=================================================
-ynh_script_progression --message="Restoring the systemd configuration..."  --weight=1
+ynh_script_progression --message="Restoring the systemd configuration..." --weight=1
 
 ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
 systemctl enable $app.service --quiet
@@ -117,21 +105,21 @@ systemctl enable $app.service --quiet
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST
 #=================================================
-ynh_script_progression --message="Integrating service in YunoHost..."  --weight=1
+ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
 yunohost service add $app --description="Self-hosted internet archiving" --log="/var/log/$app/$app.log"
 
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Starting a systemd service..."  --weight=1
+ynh_script_progression --message="Starting a systemd service..." --weight=1
 
 ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
 
 #=================================================
 # RESTORE THE LOGROTATE CONFIGURATION
 #=================================================
-ynh_script_progression --message="Restoring the logrotate configuration..."  --weight=1
+ynh_script_progression --message="Restoring the logrotate configuration..." --weight=1
 
 ynh_restore_file --origin_path="/etc/logrotate.d/$app"
 
@@ -140,7 +128,7 @@ ynh_restore_file --origin_path="/etc/logrotate.d/$app"
 #=================================================
 # RELOAD NGINX AND PHP-FPM
 #=================================================
-ynh_script_progression --message="Reloading NGINX"  --weight=1
+ynh_script_progression --message="Reloading NGINX" --weight=1
 
 ynh_systemd_action --service_name=nginx --action=reload
 
@@ -148,4 +136,4 @@ ynh_systemd_action --service_name=nginx --action=reload
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Restoration completed for $app"  --last
+ynh_script_progression --message="Restoration completed for $app" --last
diff --git a/scripts/upgrade b/scripts/upgrade
index 28aa98e..1a28962 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading installation settings..."  --weight=1
+ynh_script_progression --message="Loading installation settings..." --weight=1
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -30,18 +30,12 @@ port=$(ynh_app_setting_get --app=$app --key=port)
 # CHECK VERSION
 #=================================================
 
-### This helper will compare the version of the currently installed app and the version of the upstream package.
-### $upgrade_type can have 2 different values
-### - UPGRADE_APP if the upstream app version has changed
-### - UPGRADE_PACKAGE if only the YunoHost package has changed
-### ynh_check_app_version_changed will stop the upgrade if the app is up to date.
-### UPGRADE_APP should be used to upgrade the core app only if there's an upgrade to do.
 upgrade_type=$(ynh_check_app_version_changed)
 
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
 #=================================================
-ynh_script_progression --message="Backing up the app 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
@@ -57,14 +51,14 @@ ynh_abort_if_errors
 #=================================================
 # STOP SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Stopping a systemd service..."  --weight=1
+ynh_script_progression --message="Stopping a systemd service..." --weight=1
 
 ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log"
 
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
 #=================================================
-ynh_script_progression --message="Ensuring downward compatibility..."  --weight=1
+ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
 
 # Cleaning legacy permissions
 if ynh_legacy_permissions_exists; then
@@ -76,7 +70,7 @@ fi
 #=================================================
 # CREATE DEDICATED USER
 #=================================================
-ynh_script_progression --message="Making sure dedicated system user exists..."  --weight=1
+ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1
 
 # Create a dedicated user (if not existing)
 ynh_system_user_create --username=$app --home_dir="$final_path"
@@ -89,7 +83,7 @@ datadir=/home/yunohost.app/$app
 
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
-	ynh_script_progression --message="Upgrading via pip"  --weight=1
+	ynh_script_progression --message="Upgrading via pip" --weight=1
     python3 -m venv "${final_path}/venv"
     cp ../conf/requirements.txt "$final_path/requirements.txt"
     chown -R "$app" "$final_path"
@@ -107,16 +101,10 @@ then
     archivebox_cmd="$final_path/venv/bin/archivebox"
 
     # rerun archivebox setup (its idempotent, so it should be ok during upgrade)
-    ynh_script_progression --message="Finishing Archivebox Setup"  --weight=1
+    ynh_script_progression --message="Finishing Archivebox Setup" --weight=1
     cd $datadir && ynh_exec_as $app $archivebox_cmd init --setup
 fi
 
-# FIXME: this should be managed by the core in the future
-# Here, as a packager, you may have to tweak the ownerhsip/permissions
-# such that the appropriate users (e.g. maybe www-data) can access
-# files in some cases.
-# But FOR THE LOVE OF GOD, do not allow r/x for "others" on the entire folder -
-# this will be treated as a security issue.
 chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"
@@ -124,7 +112,7 @@ chown -R $app:www-data "$final_path"
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Upgrading NGINX web server configuration..."  --weight=1
+ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
 
 # Create a dedicated NGINX config
 ynh_add_nginx_config
@@ -132,7 +120,7 @@ ynh_add_nginx_config
 #=================================================
 # UPGRADE DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Upgrading dependencies..."  --weight=1
+ynh_script_progression --message="Upgrading dependencies..." --weight=1
 
 ynh_install_app_dependencies $pkg_dependencies
 
@@ -145,7 +133,7 @@ ynh_install_app_dependencies $pkg_dependencies
 #=================================================
 # SETUP SYSTEMD
 #=================================================
-ynh_script_progression --message="Upgrading systemd configuration..."  --weight=1
+ynh_script_progression --message="Upgrading systemd configuration..." --weight=1
 
 # Create a dedicated systemd config
 ynh_add_systemd_config
@@ -155,7 +143,7 @@ ynh_add_systemd_config
 #=================================================
 # SETUP LOGROTATE
 #=================================================
-ynh_script_progression --message="Upgrading logrotate configuration..."  --weight=1
+ynh_script_progression --message="Upgrading logrotate configuration..." --weight=1
 
 # Use logrotate to manage app-specific logfile(s)
 ynh_use_logrotate --non-append
@@ -163,21 +151,21 @@ ynh_use_logrotate --non-append
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST
 #=================================================
-ynh_script_progression --message="Integrating service in YunoHost..."  --weight=1
+ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
 yunohost service add $app --description="Self-hosted internet archiving" --log="/var/log/$app/$app.log"
 
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Starting a systemd service..."  --weight=1
+ynh_script_progression --message="Starting a systemd service..." --weight=1
 
 ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
 
 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_script_progression --message="Reloading NGINX web server..."  --weight=1
+ynh_script_progression --message="Reloading NGINX web server..." --weight=1
 
 ynh_systemd_action --service_name=nginx --action=reload
 
@@ -185,4 +173,4 @@ ynh_systemd_action --service_name=nginx --action=reload
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Upgrade of $app completed"  --last
+ynh_script_progression --message="Upgrade of $app completed" --last