Only ever iterate over selected repos

This allows us to drop the directory-exists checks.

Author: edg2s

new.php

@@ -362,6 +362,7 @@ function set_progress( float $pc, string $label ) {
 		'SERVER' => $server,
 		'SERVERPATH' => $serverPath,
 		'LANGUAGE' => $language,
+		'REPOSITORIES' => $reposString,
 	]
 );
 if ( $error ) {
@@ -384,6 +385,7 @@ function set_progress( float $pc, string $label ) {
 		'MAINPAGE' => $mainPage,
 		'USE_PROXY' => $useProxy,
 		'USE_INSTANT_COMMONS' => $useInstantCommons,
+		'REPOSITORIES' => $reposString,
 	]
 );
 if ( $error ) {

new/install.sh

@@ -22,12 +22,10 @@ cat $PATCHDEMO/localsettings/core.txt >> $PATCHDEMO/wikis/$NAME/w/LocalSettings.
 while IFS=' ' read -r repo dir; do
 	filename=$(echo $repo | sed "s/\//-/g" | sed "s/^mediawiki-//")
 	if [ -f $PATCHDEMO/localsettings/$filename.txt ]; then
-		if [ -d $PATCHDEMO/wikis/$NAME/$dir ]; then
-			echo -e "\n// $repo" >> $PATCHDEMO/wikis/$NAME/w/LocalSettings.php
-			cat $PATCHDEMO/localsettings/$filename.txt >> $PATCHDEMO/wikis/$NAME/w/LocalSettings.php
-		fi
+		echo -e "\n// $repo" >> $PATCHDEMO/wikis/$NAME/w/LocalSettings.php
+		cat $PATCHDEMO/localsettings/$filename.txt >> $PATCHDEMO/wikis/$NAME/w/LocalSettings.php
 	fi
-done < $PATCHDEMO/repository-lists/all.txt
+done <<< "$REPOSITORIES"
 
 # create htaccess
 echo "RewriteEngine On

new/postinstall.sh

@@ -42,15 +42,13 @@ fi
 # 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
+	# 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
+done <<< "$REPOSITORIES"
 
 # import generic XML dumps (core-*.xml)
 for page in $(find $PATCHDEMO/pages -name "core-*.xml" -not -type d -printf '%P\n')