diff --git a/README.md b/README.md index ef93cc9..87b7322 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Moodle is widely used around the world by universities, schools, companies and all manner of organisations and individuals. -**Shipped version:** 3.9.2 +**Shipped version:** 3.10.0 ## Screenshots diff --git a/check_process b/check_process index f57fbdf..7714d41 100644 --- a/check_process +++ b/check_process @@ -19,7 +19,6 @@ port_already_use=0 change_url=0 ;;; Levels - # If the level 5 (Package linter) is forced to 1. Please add justifications here. Level 5=auto ;;; Options Email= diff --git a/conf/app.src b/conf/app.src index 943ce1e..e83f1b3 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/moodle/moodle/archive/v3.9.2.zip -SOURCE_SUM=eecb0e1247b9a1de4d3bcd3962946005d8e052a6bf311163cc2d330a9bfe172d +SOURCE_URL=https://github.com/moodle/moodle/archive/v3.10.0.zip +SOURCE_SUM=c80cfa811acda62363cccdd876bf001e802ceccb1f261846c9e59c6a66f6b125 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index c321887..8071890 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Online learning platform", "fr": "Plateforme d'apprentissage en ligne" }, - "version": "3.9.2~ynh1", + "version": "3.10.0~ynh1", "url": "https://moodle.org/", "license": "GPL-3.0-or-later", "maintainer": { @@ -14,7 +14,7 @@ "email": "anmol@datamol.org" }, "requirements": { - "yunohost": ">= 3.8.1" + "yunohost": ">= 4.0.0" }, "multi_instance": true, "services": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index 0a05c81..956370d 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,7 +9,7 @@ pkg_dependencies="postgresql" YNH_PHP_VERSION="7.3" -extra_php_dependencies="php$YNH_PHP_VERSION-common php$YNH_PHP_VERSION-mbstring php$YNH_PHP_VERSION-curl php$YNH_PHP_VERSION-xmlrpc php$YNH_PHP_VERSION-soap php$YNH_PHP_VERSION-zip php$YNH_PHP_VERSION-gd php$YNH_PHP_VERSION-xml php$YNH_PHP_VERSION-intl php$YNH_PHP_VERSION-json php$YNH_PHP_VERSION-pgsql php$YNH_PHP_VERSION-ldap" +extra_php_dependencies="php${YNH_PHP_VERSION}-common php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-xmlrpc php${YNH_PHP_VERSION}-soap php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-pgsql php${YNH_PHP_VERSION}-ldap" #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index 3a0b12a..3f39060 100644 --- a/scripts/install +++ b/scripts/install @@ -157,9 +157,9 @@ ynh_script_progression --message="Adding cron job..." # Set up poller cp "../conf/cron" "/etc/cron.d/$app" -ynh_replace_string "__APP__" "$app" "/etc/cron.d/$app" -ynh_replace_string "__FINAL_PATH__" "$final_path" "/etc/cron.d/$app" -ynh_replace_string "__PHPVERSION__" "$phpversion" "/etc/cron.d/$app" +ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="/etc/cron.d/$app" +ynh_replace_string --match_string="__FINAL_PATH__" --replace_string="$final_path" --target_file="/etc/cron.d/$app" +ynh_replace_string --match_string="__PHPVERSION__" --replace_string="$phpversion" --target_file="/etc/cron.d/$app" #================================================= # GENERIC FINALIZATION diff --git a/scripts/restore b/scripts/restore index 396d9b6..175cc7f 100644 --- a/scripts/restore +++ b/scripts/restore @@ -123,7 +123,7 @@ ynh_restore_file --origin_path="/etc/cron.d/$app" #================================================= ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..." -ynh_systemd_action --service_name=php"$phpversion"-fpm --action=reload +ynh_systemd_action --service_name=php$phpversion-fpm --action=reload ynh_systemd_action --service_name=nginx --action=reload #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index fb33027..db792ac 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -38,7 +38,7 @@ ynh_script_progression --message="Ensuring downward compatibility..." # If the admin is not defined, We can't upgrade this app if [ -z "$admin" ]; then - ynh_die --message="This app can't be upgraded from a very old version of the package. Please remove and reinstall Moodle_ynh" + ynh_die --message="This app can't be upgraded from a very old version of the package. Please remove and reinstall moodle_ynh" fi #=================================================