diff --git a/scripts/install b/scripts/install index 6a3cdc9..fe11920 100644 --- a/scripts/install +++ b/scripts/install @@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_script_progression --message="Setting up source files..." +ynh_script_progression --message="Setting up source files..." --weight=2 # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" @@ -36,7 +36,7 @@ chmod 644 "/etc/cron.d/$app" #================================================= # SETUP APPLICATION WITH CURL #================================================= -ynh_script_progression --message="Setting up application with CURL..." +ynh_script_progression --message="Setting up application with CURL..." --weight=2 # Installation with curl ynh_local_curl "/index.php?mod=install" \ @@ -47,4 +47,4 @@ ynh_local_curl "/index.php?mod=install" \ # END OF SCRIPT #================================================= -ynh_script_progression --message="Installation of $app completed" +ynh_script_progression --message="Installation of $app completed" --last diff --git a/scripts/remove b/scripts/remove index 5707ff0..01f53ee 100644 --- a/scripts/remove +++ b/scripts/remove @@ -24,4 +24,4 @@ ynh_secure_remove --file="/etc/cron.d/$app" # END OF SCRIPT #================================================= -ynh_script_progression --message="Removal of $app completed" +ynh_script_progression --message="Removal of $app completed" --last diff --git a/scripts/restore b/scripts/restore index 1390c74..c0578ae 100644 --- a/scripts/restore +++ b/scripts/restore @@ -6,13 +6,14 @@ # IMPORT GENERIC HELPERS #================================================= +# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers #================================================= # RESTORE THE APP MAIN DIR #================================================= -ynh_script_progression --message="Restoring the app main directory..." --weight=5 +ynh_script_progression --message="Restoring the app main directory..." --weight=2 ynh_restore_file --origin_path="$install_dir" @@ -53,4 +54,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 b1080a1..8f30409 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -28,7 +28,7 @@ then fi chmod -R o-rwx "$install_dir" -chown -R $app:www-data "$install_dir" +chown -R "$app:www-data" "$install_dir" #================================================= # REAPPLY SYSTEM CONFIGURATIONS