fix: Improve Tiny plugins installation

wiris · Mar 27, 2024 · 3ac8263 · 3ac8263
1 parent c8d83ec
commit 3ac8263
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/bin/wiris-moodle-docker-install b/bin/wiris-moodle-docker-install
@@ -92,13 +92,20 @@ else
     MOODLE_VERSION=9999
 fi
 
-# Check if we are at a lower Moodle version than 4.0.2 to install one Tiny or the other.
-if [ $MOODLE_VERSION -lt "0402" ]; then
+# Check if we are at a lower Moodle version than 4.0.1 to install Tiny, Tiny-legacy or both.
+if [ $MOODLE_VERSION -lt "0401" -a $MOODLE_VERSION != "0000" ]; then
     WIRIS_MOODLE_MATHTYPE_PLUGINS=(
         'moodle-filter_wiris::filter/wiris'
         'moodle-atto_wiris::lib/editor/atto/plugins/wiris'
         'moodle-tinymce_tiny_mce_wiris::lib/editor/tinymce/plugins/tiny_mce_wiris'
     )
+elif  [ $MOODLE_VERSION = "0401" ]; then
+    WIRIS_MOODLE_MATHTYPE_PLUGINS=(
+        'moodle-filter_wiris::filter/wiris'
+        'moodle-atto_wiris::lib/editor/atto/plugins/wiris'
+        'moodle-tinymce_tiny_mce_wiris::lib/editor/tinymce/plugins/tiny_mce_wiris'
+        'moodle-tinymce6_wiris::lib/editor/tiny/plugins/wiris'
+    )
 else 
     WIRIS_MOODLE_MATHTYPE_PLUGINS=(
         'moodle-filter_wiris::filter/wiris'

diff --git a/bin/wiris-moodle-docker-start b/bin/wiris-moodle-docker-start
@@ -49,7 +49,7 @@ fi
 if [ -e "databases/${WIRIS_MOODLE_BRANCH}.sql" ]; then
     WIRIS_MOODLE_IMPORTED_DB="databases/${WIRIS_MOODLE_BRANCH}.sql" 
 else
-    WIRIS_MOODLE_IMPORTED_DB="databases/MOODLE_400_STABLE.sql"
+    WIRIS_MOODLE_IMPORTED_DB="databases/MOODLE_403_STABLE.sql"
 fi
 
 echo "=> Setting up Database ${WIRIS_MOODLE_IMPORTED_DB}"