BryanDavis has uploaded a new change for review. https://gerrit.wikimedia.org/r/184014
Change subject: Make ISO README friendlier for Windows users ...................................................................... Make ISO README friendlier for Windows users Make the README packaged in ISO image distributions (usb sticks at hackathons generally) friendlier for Windows users: * Rename from README to README.txt to make double clicking easier * Convert to DOS/Windows CRLF style line endings so it doesn't look a like a giant run-on sentence in Notepad Bug: T71208 Change-Id: I9c3ee835e777c4e3c0866f7c523c8fddc97bc696 --- M .gitattributes R support/packager/template/README.txt 2 files changed, 19 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/14/184014/1 diff --git a/.gitattributes b/.gitattributes index 5a43e73..514a8da 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,3 +2,6 @@ *.png binary *.ico binary *.ppk binary + +# Keep README for iso easily readable by Windows clients +/support/packager/template/README.txt text eol=crlf diff --git a/support/packager/template/README b/support/packager/template/README.txt similarity index 70% rename from support/packager/template/README rename to support/packager/template/README.txt index d168594..2dc741c 100644 --- a/support/packager/template/README +++ b/support/packager/template/README.txt @@ -14,40 +14,43 @@ Replace /usb_drive with the location of the USB drive, or the location where you copied the files from the drive. -1. If you don't have a Gerrit username yet, signup at +1. If you don't have git installed (typically only windows users), install it + from http://git-scm.com/downloads + +2. If you don't have a Gerrit username yet, signup at https://wikitech.wikimedia.org/wiki/Special:UserLogin/signup . The username you choose will be referred to below as GERRIT_USER . -2. From the directory for your OS, install VirtualBox. +3. From the directory for your OS, install VirtualBox. -3. From the directory for your OS, install Vagrant. If you use Linux, +4. From the directory for your OS, install Vagrant. If you use Linux, use files from Linux/DEB/ for Debian or Ubuntu and Linux/RPM/ for Red Hat, Centos, Fedora, etc. -4. Install the virtual machine Vagrant uses as a base: +5. Install the virtual machine Vagrant uses as a base: $ cd /usb_drive $ vagrant box add trusty-cloud trusty-server-cloudimg-amd64-vagrant-disk1.box -5. Install the "vagrant-vbguest" Vagrant plugin: +6. Install the "vagrant-vbguest" Vagrant plugin: $ cd /usb_drive/Plugins $ vagrant plugin install vagrant-vbguest-0.10.0.gem -5. Clone MediaWiki-Vagrant from the provided git bundle file: +7. Clone MediaWiki-Vagrant from the provided git bundle file: $ cd /usb_drive $ git clone -b master mediawiki_vagrant.bundle ~/Vagrant -7. Copy pre-populated caches: +8. Copy pre-populated caches: - $ cp -R cache ~/Vagrant/cache + $ cp -Rf cache ~/Vagrant/cache -8. Clone MediaWiki core from the provided git bundle file: +9. Clone MediaWiki core from the provided git bundle file: $ git clone -b master mediawiki_core.bundle ~/Vagrant/mediawiki -9. Configure git repositories to sync with Gerrit: +10. Configure git repositories to sync with Gerrit: $ cd ~/Vagrant $ git remote set-url origin ssh://[email protected]:29418/mediawiki/vagrant.git @@ -55,17 +58,18 @@ $ cd ~/Vagrant/mediawiki $ git remote set-url origin ssh://[email protected]:29418/mediawiki/core.git -10. Update MediaWiki-Vagrant and MediaWiki core git repositories to latest +11. Update MediaWiki-Vagrant and MediaWiki core git repositories to latest versions: $ cd ~/Vagrant $ git pull $ git submodule update --init --recursive + $ git checkout -- . $ cd ~/Vagrant/mediawiki $ git pull -11. Start your MediaWiki-Vagrant virtual machine for the first time: +12. Start your MediaWiki-Vagrant virtual machine for the first time: $ cd ~/Vagrant $ ./setup.sh -- To view, visit https://gerrit.wikimedia.org/r/184014 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9c3ee835e777c4e3c0866f7c523c8fddc97bc696 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: BryanDavis <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
