Import pages by installed extensions

Fixes #344

Author: edg2s

new/install.sh

@@ -17,7 +17,7 @@ php $PATCHDEMO/wikis/$NAME/w/maintenance/install.php \
 # apply our default settings
 cat $PATCHDEMO/localsettings/core.txt >> $PATCHDEMO/wikis/$NAME/w/LocalSettings.php
 
-# apply extension/skin/service-sepcific setings
+# apply extension/skin/service-specific settings
 while IFS=' ' read -r repo dir; do
 	filename=$(echo $repo | sed "s/\//-/g" | sed "s/^mediawiki-//")
 	if [ -f $PATCHDEMO/localsettings/$filename.txt ]; then

new/postinstall.sh

@@ -38,9 +38,23 @@ if [ -d $PATCHDEMO/wikis/$NAME/w/extensions/SecurePoll ]; then
 	php $PATCHDEMO/wikis/$NAME/w/maintenance/createAndPromote.php "Patch Demo" --force --custom-groups electionadmin
 fi
 
-# import XML dumps
-for page in $(find $PATCHDEMO/pages -name "*.xml" -not -type d -printf '%P\n')
+# import extension/skin/service-specific XML dumps
+while IFS=' ' read -r repo dir; do
+	filename=$(echo $repo | sed "s/\//-/g" | sed "s/^mediawiki-//")
+	if [ -d $PATCHDEMO/wikis/$NAME/$dir ]; then
+		# matches extension-foo.xml or extension-foo-*.xml
+		for page in $(find $PATCHDEMO/pages -regextype egrep -regex ".*/$filename(-.+)?.xml" -not -type d -printf '%P\n')
+		do
+			echo "Importing $PATCHDEMO/pages/$page"
+			php $PATCHDEMO/wikis/$NAME/w/maintenance/importDump.php < $PATCHDEMO/pages/$page
+		done
+	fi
+done < $PATCHDEMO/repository-lists/all.txt
+
+# import generic XML dumps (core-*.xml)
+for page in $(find $PATCHDEMO/pages -name "core-*.xml" -not -type d -printf '%P\n')
 do
+	echo "Importing $PATCHDEMO/pages/$page"
 	php $PATCHDEMO/wikis/$NAME/w/maintenance/importDump.php < $PATCHDEMO/pages/$page
 done
 

pages/README.md

@@ -1,8 +1,12 @@
 Default page content for extensions/features
 ----
 
-Add per-extension or per-feature XML dumps here. XML dumps are generated by [[Special:Export]].
+Add XML dumps here. XML dumps are generated by [[Special:Export]].
 
-Any XML files in this directory will be automatically imported when wikis are created.
+Use the name of the extension/service/skin or as a prefix to only import the dump when it is installed,
+e.g. `extensions-VisualEditor.xml` or `extensions-VisualEditor-tables.xml`
 
-You may also include a txt file listing the pages that are included in your dump, to assist others in maintaining the dump.
+Use the "core-" prefix to always import a dump,
+e.g. `core-userpages.xml`
+
+You should also include a corresponding `.txt` file listing the pages that are included in your dump, to assist others in maintaining the dump.