diff --git a/scripts/_common.sh b/scripts/_common.sh index 944a65e..552e434 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,6 +4,29 @@ # COMMON VARIABLES #================================================= +upgrade_dolibarr() { + ynh_setup_source --source_id="$source_id" --dest_dir="$install_dir" + chmod -R o-rwx "$install_dir" + chown -R "$app:www-data" "$install_dir" + + # Remove the lock if it exists + lock=$install_dir/documents/install.lock + if [ -f "$lock" ]; then + ynh_secure_remove --file="$lock" + fi + + pushd "$install_dir/htdocs/install/" + "php$phpversion" upgrade.php "$current_version" "$new_version" + ynh_exec_fully_quiet sleep 5 + + "php$phpversion" upgrade2.php "$current_version" "$new_version" + ynh_exec_fully_quiet sleep 5 + + "php$phpversion" step5.php "$current_version" "$new_version" + ynh_exec_fully_quiet sleep 5 + popd +} + #================================================= # PERSONAL HELPERS #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index b859968..1cc18da 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -53,29 +53,6 @@ ynh_add_fpm_config --usage="$fpm_usage" --footprint="$fpm_footprint" #================================================= ynh_script_progression --message="Upgrading source files..." --weight=60 -upgrade_dolibarr() { - ynh_setup_source --source_id="$source_id" --dest_dir="$install_dir" - chmod -R o-rwx "$install_dir" - chown -R "$app:www-data" "$install_dir" - - # Remove the lock if it exists - lock=$install_dir/documents/install.lock - if [ -f "$lock" ]; then - ynh_secure_remove --file="$lock" - fi - - pushd "$install_dir/htdocs/install/" - "php$phpversion" upgrade.php "$current_version" "$new_version" - ynh_exec_fully_quiet sleep 5 - - "php$phpversion" upgrade2.php "$current_version" "$new_version" - ynh_exec_fully_quiet sleep 5 - - "php$phpversion" step5.php "$current_version" "$new_version" - ynh_exec_fully_quiet sleep 5 - popd -} - # Sort --version-sort cdécembrean handle underscore in versions numbers mapfile -t main_versions < <( ynh_read_manifest --key="resources.sources | keys[]" | grep "main_" | sort --version-sort