Brion VIBBER has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/383499 )
Change subject: Check for new vagrant ruby.exe location on Windows ...................................................................... Check for new vagrant ruby.exe location on Windows Vagrant for Windows has moved ruby.exe to its mingw64 subdir, breaking the setup.bat call. Definitely broken in 1.9.7 and 2.0.0. Adds a check for the old location, and if not present tries the new location instead. Bug: T171380 Change-Id: Ib34569e12cd0bfe6adce58eb2a902f2354be1f14 --- M setup.bat 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/99/383499/1 diff --git a/setup.bat b/setup.bat index a921499..ed00b14 100644 --- a/setup.bat +++ b/setup.bat @@ -14,4 +14,8 @@ for /f "tokens=*" %%F in ('where vagrant.exe') do set vagrant=%%F -"%vagrant%\..\..\embedded\bin\ruby.exe" "%~dp0\support\setup.rb" "%0" %* +if exist "%vagrant%\..\..\embedded\bin\ruby.exe" ( + "%vagrant%\..\..\embedded\bin\ruby.exe" "%~dp0\support\setup.rb" "%0" %* +) else ( + "%vagrant%\..\..\embedded\mingw64\bin\ruby.exe" "%~dp0\support\setup.rb" "%0" %* +) -- To view, visit https://gerrit.wikimedia.org/r/383499 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib34569e12cd0bfe6adce58eb2a902f2354be1f14 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Brion VIBBER <br...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits