jenkins-bot has submitted this change and it was merged. Change subject: Get maintenance scripts to respect MW_INSTALL_PATH ......................................................................
Get maintenance scripts to respect MW_INSTALL_PATH Change-Id: Ib06fd4c29517dce4b61c26aebb030d24c318334a --- M forceSearchIndex.php M updateSearchConfig.php 2 files changed, 11 insertions(+), 2 deletions(-) Approvals: Demon: Looks good to me, approved jenkins-bot: Verified diff --git a/forceSearchIndex.php b/forceSearchIndex.php index afc33d0..7287778 100644 --- a/forceSearchIndex.php +++ b/forceSearchIndex.php @@ -17,7 +17,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * http://www.gnu.org/copyleft/gpl.html */ -require_once( "maintenance/Maintenance.php" ); + +$IP = getenv( 'MW_INSTALL_PATH' ); +if( $IP === false ) { + $IP = __DIR__ . '/../..'; +} +require_once( "$IP/maintenance/Maintenance.php" ); /** * @todo Right now this basically duplicates core's updateSearchIndex and SearchUpdate diff --git a/updateSearchConfig.php b/updateSearchConfig.php index 5717985..fbb5474 100644 --- a/updateSearchConfig.php +++ b/updateSearchConfig.php @@ -17,8 +17,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * http://www.gnu.org/copyleft/gpl.html */ -require_once( "maintenance/Maintenance.php" ); +$IP = getenv( 'MW_INSTALL_PATH' ); +if( $IP === false ) { + $IP = __DIR__ . '/../..'; +} +require_once( "$IP/maintenance/Maintenance.php" ); /** * Update the elasticsearch configuration for this index. */ -- To view, visit https://gerrit.wikimedia.org/r/76513 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib06fd4c29517dce4b61c26aebb030d24c318334a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CirrusSearch Gerrit-Branch: master Gerrit-Owner: Manybubbles <[email protected]> Gerrit-Reviewer: Demon <[email protected]> Gerrit-Reviewer: Manybubbles <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
