Merge pull request #15 from YunoHost-Apps/manifestv2

Manifestv2

README.md

@@ -19,9 +19,9 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 Luckysheet is an online spreadsheet that is powerful, simple to configure, and completely open source.
 
 
-**Shipped version:** 2.1.13~ynh1
+**Shipped version:** 2.1.13~ynh2
 
-**Demo:** https://mengshukeji.gitee.io/luckysheetdemo/
+**Demo:** https://dream-num.github.io/LuckysheetDemo
 
 ## Screenshots
 
@@ -29,8 +29,8 @@ Luckysheet is an online spreadsheet that is powerful, simple to configure, and c
 
 ## Documentation and resources
 
-* Official app website: <https://github.com/mengshukeji/Luckysheet>
+* Official app website: <https://dream-num.github.io/LuckysheetDocs/>
-* Official admin documentation: <https://mengshukeji.github.io/LuckysheetDocs/guide/>
+* Official admin documentation: <https://dream-num.github.io/LuckysheetDocs/guide/>
 * Upstream app code repository: <https://github.com/mengshukeji/Luckysheet>
 * YunoHost Store: <https://apps.yunohost.org/app/luckysheet>
 * Report a bug: <https://github.com/YunoHost-Apps/luckysheet_ynh/issues>

README_fr.md

@@ -19,9 +19,9 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 Luckysheet est une feuille de calcul en ligne, puissante, simple à configurer et complètement open source.
 
 
-**Version incluse :** 2.1.13~ynh1
+**Version incluse :** 2.1.13~ynh2
 
-**Démo :** https://mengshukeji.gitee.io/luckysheetdemo/
+**Démo :** https://dream-num.github.io/LuckysheetDemo
 
 ## Captures d’écran
 
@@ -29,8 +29,8 @@ Luckysheet est une feuille de calcul en ligne, puissante, simple à configurer e
 
 ## Documentations et ressources
 
-* Site officiel de l’app : <https://github.com/mengshukeji/Luckysheet>
+* Site officiel de l’app : <https://dream-num.github.io/LuckysheetDocs/>
-* Documentation officielle de l’admin : <https://mengshukeji.github.io/LuckysheetDocs/guide/>
+* Documentation officielle de l’admin : <https://dream-num.github.io/LuckysheetDocs/guide/>
 * Dépôt de code officiel de l’app : <https://github.com/mengshukeji/Luckysheet>
 * YunoHost Store: <https://apps.yunohost.org/app/luckysheet>
 * Signaler un bug : <https://github.com/YunoHost-Apps/luckysheet_ynh/issues>

check_process

@@ -1,22 +0,0 @@
-;; Test complet
-	; Manifest
-		domain="domain.tld"
-		path="/path"
-		is_public=1
-	; Checks
-		pkg_linter=1
-		setup_sub_dir=1
-		setup_root=1
-		setup_nourl=0
-		setup_private=1
-		setup_public=1
-		upgrade=1
-		# 2.0.0~ynh4
-		upgrade=1	from_commit=e381055bd0e6b6b862bdbec72945ec589d8128d7
-		backup_restore=1
-		multi_instance=0
-		port_already_use=1
-		change_url=1
-;;; Options
-Email=
-Notification=none

conf/app.src

@@ -1,7 +0,0 @@
-SOURCE_URL=https://github.com/mengshukeji/Luckysheet/archive/v2.1.13.tar.gz
-SOURCE_SUM=9c996e1e2a47ca0bb37b17840f7ded82ed999899daf3bd620b07c154b71647f9
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=tar.gz
-SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=
-SOURCE_EXTRACT=true

conf/nginx.conf

@@ -2,7 +2,7 @@
 location __PATH__/ {
 
     # Path to source
-  alias __FINALPATH__/live/;
+    alias __INSTALL_DIR__/live/;
 
     index index.html;
 

manifest.json

@@ -1,52 +0,0 @@
-{
-    "name": "Luckysheet",
-    "id": "luckysheet",
-    "packaging_format": 1,
-    "description": {
-        "en": "Online spreadsheet that is powerful, simple to configure",
-        "fr": "Feuille de calcul en ligne, puissante, simple à configurer"
-    },
-    "version": "2.1.13~ynh1",
-    "url": "https://github.com/mengshukeji/Luckysheet",
-    "upstream": {
-        "license": "MIT",
-        "website": "https://github.com/mengshukeji/Luckysheet",
-        "demo": "https://mengshukeji.gitee.io/luckysheetdemo/",
-        "admindoc": "https://mengshukeji.github.io/LuckysheetDocs/guide/",
-        "code": "https://github.com/mengshukeji/Luckysheet"
-    },
-    "license": "MIT",
-    "maintainer": {
-        "name": "eric_G"
-    },
-    "requirements": {
-        "yunohost": ">= 4.3.0"
-    },
-    "multi_instance": false,
-    "services": [
-        "nginx"
-    ],
-    "arguments": {
-        "install": [
-            {
-                "name": "domain",
-                "type": "domain"
-            },
-            {
-                "name": "path",
-                "type": "path",
-                "example": "/luckysheet",
-                "default": "/luckysheet"
-            },
-            {
-                "name": "is_public",
-                "type": "boolean",
-                "help": {
-                    "en": "If enabled, Luckysheet will be accessible by people who do not have an account. This can be changed later via the webadmin.",
-                    "fr": "Si cette case est cochée, Luckysheet sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin."
-                },
-                "default": true
-            }
-        ]
-    }
-}

manifest.toml

@@ -0,0 +1,59 @@
+#:schema https://raw.githubusercontent.com/YunoHost/apps/master/schemas/manifest.v2.schema.json
+
+packaging_format = 2
+
+id = "luckysheet"
+name = "Luckysheet"
+description.en = "Online spreadsheet that is powerful, simple to configure"
+description.fr = "Feuille de calcul en ligne, puissante, simple à configurer"
+
+version = "2.1.13~ynh2"
+
+maintainers = ["eric_G"]
+
+[upstream]
+license = "MIT"
+website = "https://dream-num.github.io/LuckysheetDocs/"
+demo = "https://dream-num.github.io/LuckysheetDemo"
+admindoc = "https://dream-num.github.io/LuckysheetDocs/guide/"
+code = "https://github.com/mengshukeji/Luckysheet"
+fund = "https://opencollective.com/luckysheet"
+
+[integration]
+yunohost = ">= 11.2"
+architectures = "all"
+multi_instance = false
+ldap = false
+sso = false
+disk = "50M"
+ram.build = "500M"
+ram.runtime = "500M"
+
+[install]
+    [install.domain]
+    type = "domain"
+
+    [install.path]
+    type = "path"
+    default = "/luckysheet"
+
+    [install.init_main_permission]
+    help.en = "If enabled, Luckysheet will be accessible by people who do not have an account. This can be changed later via the webadmin."
+    help.fr = "Si cette case est cochée, Luckysheet sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin."
+    type = "group"
+    default = "visitors"
+
+[resources]
+    [resources.sources.main]
+    url = "https://github.com/mengshukeji/Luckysheet/archive/v2.1.13.tar.gz"
+    sha256 = "9c996e1e2a47ca0bb37b17840f7ded82ed999899daf3bd620b07c154b71647f9"
+
+    autoupdate.strategy = "latest_github_tag"
+    autoupdate.asset = "tarball"
+
+    [resources.system_user]
+
+    [resources.install_dir]
+
+    [resources.permissions]
+    main.url = "/"

scripts/backup

@@ -10,26 +10,6 @@
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-ynh_clean_setup () {
-	true
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
-#=================================================
-# LOAD SETTINGS
-#=================================================
-ynh_print_info --message="Loading installation settings..."
-
-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)
-
 #=================================================
 # DECLARE DATA AND CONF FILES TO BACKUP
 #=================================================
@@ -39,12 +19,13 @@ ynh_print_info --message="Declaring files to be backed up..."
 # BACKUP THE APP MAIN DIR
 #=================================================
 
-ynh_backup --src_path="$final_path"
+ynh_backup --src_path="$install_dir"
 
 #=================================================
-# BACKUP THE NGINX CONFIGURATION
+# SYSTEM CONFIGURATION
 #=================================================
 
+# Backup the nginx configuration
 ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
 #=================================================

scripts/change_url

@@ -9,63 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# RETRIEVE ARGUMENTS
-#=================================================
-
-old_domain=$YNH_APP_OLD_DOMAIN
-old_path=$YNH_APP_OLD_PATH
-
-new_domain=$YNH_APP_NEW_DOMAIN
-new_path=$YNH_APP_NEW_PATH
-
-app=$YNH_APP_INSTANCE_NAME
-
-#=================================================
-# LOAD SETTINGS
-#=================================================
-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)
-
-# Add settings here as needed by your application
-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)..." --weight=1
-
-# Backup the current version of the app
-ynh_backup_before_upgrade
-ynh_clean_setup () {
-	ynh_clean_check_starting
-	# Remove the new domain config file, the remove script won't do it as it doesn't know yet its location.
-	ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
-
-	# Restore it if the upgrade fails
-	ynh_restore_upgradebackup
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
-#=================================================
-# CHECK WHICH PARTS SHOULD BE CHANGED
-#=================================================
-
-change_domain=0
-if [ "$old_domain" != "$new_domain" ]
-then
-	change_domain=1
-fi
-
-change_path=0
-if [ "$old_path" != "$new_path" ]
-then
-	change_path=1
-fi
-
 #=================================================
 # STANDARD MODIFICATIONS
 #=================================================
@@ -73,38 +16,7 @@ fi
 #=================================================
 ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1
 
-nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf
+ynh_change_url_nginx_config
-
-# Change the path in the NGINX config file
-if [ $change_path -eq 1 ]
-then
-	# Make a backup of the original NGINX config file if modified
-	ynh_backup_if_checksum_is_different --file="$nginx_conf_path"
-	# Set global variables for NGINX helper
-	domain="$old_domain"
-	path_url="$new_path"
-	# Create a dedicated NGINX config
-	ynh_add_nginx_config
-fi
-
-# Change the domain for NGINX
-if [ $change_domain -eq 1 ]
-then
-	# Delete file checksum for the old conf file location
-	ynh_delete_file_checksum --file="$nginx_conf_path"
-	mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf
-	# Store file checksum for the new config file location
-	ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
-fi
-
-#=================================================
-# GENERIC FINALISATION
-#=================================================
-# RELOAD NGINX
-#=================================================
-ynh_script_progression --message="Reloading NGINX web server..." --weight=1
-
-ynh_systemd_action --service_name=nginx --action=reload
 
 #=================================================
 # END OF SCRIPT

scripts/install

@@ -10,136 +10,62 @@ source _common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
-# MANAGE SCRIPT FAILURE
+# INSTALL NODEJS
 #=================================================
-
+ynh_script_progression --message="Installing NodeJS..." --weight=20
-ynh_clean_setup () {
-	ynh_clean_check_starting
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
-#=================================================
-# RETRIEVE ARGUMENTS FROM THE MANIFEST
-#=================================================
-
-domain=$YNH_APP_ARG_DOMAIN
-path_url=$YNH_APP_ARG_PATH
-is_public=$YNH_APP_ARG_IS_PUBLIC
-
-app=$YNH_APP_INSTANCE_NAME
-
-#=================================================
-# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
-#=================================================
-ynh_script_progression --message="Validating installation parameters..." --weight=1
-
-final_path=/var/www/$app
-test ! -e "$final_path" || ynh_die --message="This path already contains a folder"
-
-# Register (book) web path
-ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
-
-#=================================================
-# STORE SETTINGS FROM MANIFEST
-#=================================================
-ynh_script_progression --message="Storing installation settings..." --weight=2
-
-ynh_app_setting_set --app=$app --key=domain --value=$domain
-ynh_app_setting_set --app=$app --key=path --value=$path_url
-
-#=================================================
-# STANDARD MODIFICATIONS
-#=================================================
-# INSTALL DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Installing dependencies..." --weight=20
 
 # Install Nodejs
-ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
+ynh_install_nodejs --nodejs_version="$nodejs_version"
-
-#=================================================
-# CREATE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Configuring system user..." --weight=3
-
-# Create a system user
-ynh_system_user_create --username=$app --home_dir="$final_path"
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
 ynh_script_progression --message="Setting up source files..." --weight=2
 
-ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 # Download, check integrity, uncompress and patch the source from app.src
-ynh_setup_source --dest_dir="$final_path/build"
+ynh_setup_source --dest_dir="$install_dir/source"
 
-chmod 750 "$final_path"
+chmod 750 "$install_dir"
-chmod -R o-rwx "$final_path"
+chmod -R o-rwx "$install_dir"
-chown -R $app:www-data "$final_path"
+chown -R "$app:www-data" "$install_dir"
 
-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Configuring NGINX web server..." --weight=2
-
-# Create a dedicated NGINX config
-ynh_add_nginx_config
-
-#=================================================
-# SPECIFIC SETUP
 #=================================================
 # BUILD APP
 #=================================================
 ynh_script_progression --message="Building app... (this will take some time and resources!)" --weight=20
 
-pushd "$final_path/build"
+pushd "$install_dir/source"
     ynh_use_nodejs
-	ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install
+    ynh_exec_warn_less ynh_exec_as "$app" "$ynh_node_load_PATH" "$ynh_npm" install
-	ynh_npm install gulp -g
+    ynh_exec_warn_less env "$ynh_node_load_PATH" "$ynh_npm" install gulp -g
-	ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm run build
+    ynh_exec_warn_less ynh_exec_as "$app" "$ynh_node_load_PATH" "$ynh_npm" run build
 popd
 
-ynh_exec_as $app mv "$final_path/build/dist" "$final_path/live"
+ynh_exec_as "$app" mv "$install_dir/source/dist" "$install_dir/live"
 
-ynh_secure_remove --file="$final_path/build"
+ynh_secure_remove --file="$install_dir/source"
 
-chmod 750 "$final_path"
+chmod 750 "$install_dir"
-chmod -R o-rwx "$final_path"
+chmod -R o-rwx "$install_dir"
-chown -R $app:www-data "$final_path"
+chown -R "$app:www-data" "$install_dir"
 
 #=================================================
 # ADD A CONFIGURATION
 #=================================================
 ynh_script_progression --message="Adding a configuration file..."
 
-ynh_add_config --template="../conf/config.example.js" --destination="$final_path/live/config.js"
+ynh_add_config --template="config.example.js" --destination="$install_dir/live/config.js"
 
-chmod 400 "$final_path/live/config.js"
+chmod 400 "$install_dir/live/config.js"
-chown $app:$app "$final_path/live/config.js"
+chown "$app:$app" "$install_dir/live/config.js"
 
 #=================================================
-# GENERIC FINALIZATION
+# SYSTEM CONFIGURATION
 #=================================================
-# SETUP SSOWAT
+ynh_script_progression --message="Adding system configurations related to $app..." --weight=1
-#=================================================
-ynh_script_progression --message="Configuring permissions..." --weight=1
 
-# Make app public if necessary
+# Create a dedicated NGINX config
-if [ $is_public -eq 1 ]
+ynh_add_nginx_config
-then
-	# Everyone can access the app.
-	# The "main" permission is automatically created before the install script.
-	ynh_permission_update --permission="main" --add="visitors"
-fi
-
-#=================================================
-# RELOAD NGINX
-#=================================================
-ynh_script_progression --message="Reloading NGINX web server..." --weight=2
-
-ynh_systemd_action --service_name=nginx --action=reload
 
 #=================================================
 # END OF SCRIPT

scripts/remove

@@ -10,50 +10,14 @@ source _common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
-# LOAD SETTINGS
+# REMOVE SYSTEM CONFIGURATIONS
 #=================================================
-ynh_script_progression --message="Loading installation settings..." --weight=1
+ynh_script_progression --message="Removing system configurations related to $app..." --weight=1
 
-app=$YNH_APP_INSTANCE_NAME
-
-domain=$(ynh_app_setting_get --app=$app --key=domain)
-final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-
-#=================================================
-# STANDARD REMOVE
-#=================================================
-# REMOVE APP MAIN DIR
-#=================================================
-ynh_script_progression --message="Removing app main directory..." --weight=6
-
-# Remove the app directory securely
-ynh_secure_remove --file="$final_path"
-
-#=================================================
-# REMOVE NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Removing NGINX web server configuration..." --weight=5
-
-# Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
-#=================================================
-# REMOVE DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Removing dependencies..." --weight=1
-
 ynh_remove_nodejs
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# REMOVE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Removing the dedicated system user..." --weight=1
-
-# Delete a system user
-ynh_system_user_delete --username=$app
-
 #=================================================
 # END OF SCRIPT
 #=================================================

scripts/restore

@@ -10,62 +10,21 @@
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-ynh_clean_setup () {
-	ynh_clean_check_starting
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
-#=================================================
-# LOAD SETTINGS
-#=================================================
-ynh_script_progression --message="Loading installation settings..." --weight=1
-
-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)
-
-#=================================================
-# CHECK IF THE APP CAN BE RESTORED
-#=================================================
-ynh_script_progression --message="Validating restoration parameters..." --weight=2
-
-test ! -d $final_path \
-	|| ynh_die --message="There is already a directory: $final_path "
-
-#=================================================
-# STANDARD RESTORATION STEPS
-#=================================================
-# RECREATE THE DEDICATED USER
-#=================================================
-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"
-
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
 ynh_script_progression --message="Restoring the app main directory..." --weight=50
 
-ynh_restore_file --origin_path="$final_path"
+ynh_restore_file --origin_path="$install_dir"
 
-chmod 750 "$final_path"
+chmod 750 "$install_dir"
-chmod -R o-rwx "$final_path"
+chmod -R o-rwx "$install_dir"
-chown -R $app:www-data "$final_path"
+chown -R "$app:www-data" "$install_dir"
 
 #=================================================
-# SPECIFIC RESTORATION
+# RESTORE SYSTEM CONFIGURATIONS
 #=================================================
-# RESTORE THE NGINX CONFIGURATION
+ynh_script_progression --message="Restoring system configurations related to $app..." --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"
 

scripts/upgrade

@@ -10,37 +10,12 @@ source _common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
-# LOAD SETTINGS
+# INSTALL NODEJS
 #=================================================
-ynh_script_progression --message="Loading installation settings..." --weight=2
+ynh_script_progression --message="Installing NodeJS..." --weight=20
 
-app=$YNH_APP_INSTANCE_NAME
+# Install Nodejs
-
+ynh_install_nodejs --nodejs_version="$nodejs_version"
-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)
-
-#=================================================
-# CHECK VERSION
-#=================================================
-ynh_script_progression --message="Checking version..."
-
-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=20
-
-# Backup the current version of the app
-ynh_backup_before_upgrade
-ynh_clean_setup () {
-	ynh_clean_check_starting
-	# Restore it if the upgrade fails
-	ynh_restore_upgradebackup
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
 
 #=================================================
 # STANDARD UPGRADE STEPS
@@ -49,114 +24,71 @@ ynh_abort_if_errors
 #=================================================
 ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
 
-# Cleaning legacy permissions
-if ynh_legacy_permissions_exists; then
-	ynh_legacy_permissions_delete_all
-
-	ynh_app_setting_delete --app=$app --key=is_public
-fi
-
 # 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
+if ynh_exec_warn_less yunohost service status $app >/dev/null; then
-then
     ynh_script_progression --message="Removing $app service integration..." --weight=1
-	yunohost service remove $app
+    yunohost service remove "$app"
 fi
 
-ynh_app_setting_delete --app=$app --key=port
+ynh_app_setting_delete --app="$app" --key=port
-
 ynh_remove_systemd_config
 
-if [[ -d "$final_path/src/" ]]
+if [[ -d "$install_dir/src/" ]]; then
-then
+    mv "$install_dir/src" "$install_dir/live"
-    mv $final_path/src/ $final_path/live/
 fi
 
-#=================================================
-# CREATE DEDICATED USER
-#=================================================
-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"
-
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
+ynh_script_progression --message="Upgrading source files..." --weight=20
 
-if [ "$upgrade_type" == "UPGRADE_APP" ]
+# Download, check integrity, uncompress and patch the source from app.src
-then
+ynh_setup_source --dest_dir="$install_dir/source" --full_replace=1
-	ynh_script_progression --message="Upgrading source files..." --weight=20
 
-	# Download, check integrity, uncompress and patch the source from app.src
+chmod 750 "$install_dir"
-	ynh_setup_source --dest_dir="$final_path/build"
+chmod -R o-rwx "$install_dir"
-fi
+chown -R "$app:www-data" "$install_dir"
 
-chmod 750 "$final_path"
-chmod -R o-rwx "$final_path"
-chown -R $app:www-data "$final_path"
-
-#=================================================
-# UPGRADE DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Upgrading dependencies..." --weight=18
-
-# Install Nodejs
-ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
-
-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2
-
-# Create a dedicated NGINX config
-ynh_add_nginx_config
-
-#=================================================
-# SPECIFIC UPGRADE
 #=================================================
 # BUILD APP
 #=================================================
-if [ "$upgrade_type" == "UPGRADE_APP" ]
+ynh_script_progression --message="Building app... (this will take some time and resources!)" --weight=20
-then
-	ynh_script_progression --message="Building app... (this will take some time and resources!)" --weight=20
 
-	pushd "$final_path/build"
+pushd "$install_dir/source"
     ynh_use_nodejs
-		ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install
+    ynh_exec_warn_less ynh_exec_as "$app" "$ynh_node_load_PATH" "$ynh_npm" install
-		ynh_npm install gulp -g
+    ynh_exec_warn_less env "$ynh_node_load_PATH" "$ynh_npm" install gulp -g
-		ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm run build
+    ynh_exec_warn_less ynh_exec_as "$app" "$ynh_node_load_PATH" "$ynh_npm" run build
-	popd
+popd
-	tmpdir="$(mktemp -d)"
-	cp -af "$final_path/live/config.js" "$tmpdir/config.js"
-	ynh_secure_remove --file="$final_path/live"
-	mv "$final_path/build/dist" "$final_path/live"
-	cp -af "$tmpdir/config.js" "$final_path/live/config.js"
-	ynh_secure_remove --file="$tmpdir"
-fi
 
-chmod 750 "$final_path"
+mv "$install_dir/live/config.js" "$install_dir/config.js"
-chmod -R o-rwx "$final_path"
+
-chown -R $app:www-data "$final_path"
+ynh_secure_remove --file="$install_dir/live"
+ynh_exec_as "$app" mv "$install_dir/source/dist" "$install_dir/live"
+
+mv "$install_dir/config.js" "$install_dir/live/config.js"
+
+chmod 750 "$install_dir"
+chmod -R o-rwx "$install_dir"
+chown -R "$app:www-data" "$install_dir"
 
 #=================================================
 # UPDATE A CONFIG FILE
 #=================================================
 ynh_script_progression --message="Updating a configuration file..."
 
-ynh_add_config --template="../conf/config.example.js" --destination="$final_path/live/config.js"
+ynh_add_config --template="config.example.js" --destination="$install_dir/live/config.js"
 
-chmod 400 "$final_path/live/config.js"
+chmod 400 "$install_dir/live/config.js"
-chown $app:$app "$final_path/live/config.js"
+chown "$app:$app" "$install_dir/live/config.js"
 
 #=================================================
-# GENERIC FINALIZATION
+# REAPPLY SYSTEM CONFIGURATIONS
 #=================================================
-# RELOAD NGINX
+ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1
-#=================================================
-ynh_script_progression --message="Reloading NGINX web server..." --weight=1
 
-ynh_systemd_action --service_name=nginx --action=reload
+# Create a dedicated NGINX config
+ynh_add_nginx_config
 
 #=================================================
 # END OF SCRIPT

tests.toml

@@ -0,0 +1,7 @@
+#:schema https://raw.githubusercontent.com/YunoHost/apps/master/schemas/tests.v1.schema.json
+
+test_format = 1.0
+
+[default]
+
+    test_upgrade_from.e38105.name = "2.0.0~ynh4"