Merge branch 'develop'

Conflicts:
	CHANGELOG.md
	VERSION
	docs/system-requirements.md

CHANGELOG.md

@@ -1,14 +1,21 @@
 # Changelog
 
-## 1.2.0 (2015-11-10)
+## 1.2.1 (2015-11-17)
+
+- Droped /cygdrive prefix on Windows
+  - Compatibility fix for the new docker-compose binary on Windows in boot2docker-vagrant v1.3.0+
+- Fixed Ubuntu version check
+- Updated minimal versions requirements
+
+## 1.2.0 (2015-11-11)
 
 - Ubuntu support
   - Added docker-compose installation
   - Point dns service to 8.8.8.8 to prevent it from recursing to itself
 - Allow to override the user id in the cli container via DRUDE_SET_UID environment variable
   - Experimental. Requires `blinkreaction/drupal-cli:latest`
 - Fixed #65 (`dsh stop --all` should not stop system containers)
-- Docs udpates
+- Docs updates
  - MySQL DB access for external tools
  - Updated minimal versions requirements
 

VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

bin/dsh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DSH_VERSION=1.9.0
+DSH_VERSION=1.9.1
 
 help ()
 {
@@ -611,6 +611,9 @@ install_prerequisites ()
 	fi
 }
 
+# Simple function to convert a version number into a string usable for comparison in bash
+_get_version_str () { printf "%03d%03d%03d%03d" $(echo "$1" | tr '.' ' '); }
+
 # Install Docker and setup Drude on Ubuntu 14.04+
 install_ubuntu ()
 {
@@ -619,7 +622,7 @@ install_ubuntu ()
 		lsb_release="$(. /etc/lsb-release && echo "$DISTRIB_RELEASE")"
 	fi
 
-	if [[ $lsb_dist != 'Ubuntu' || $lsb_release < '14.04' ]]; then
+	if [[ $lsb_dist != 'Ubuntu' || $(_get_version_str $lsb_release) < $(_get_version_str '14.04') ]]; then
 		echo-red "Sorry, this script only supports Ubuntu 14.04+"
 		exit 1
 	fi
@@ -882,7 +885,6 @@ _bash ()
 	# workaround through vagrant until docker solves the issue with cygwin
 	if is_windows; then
 		check_docker_running
-		cwd=$(cygpath $(cygpath -aw .));
 		local container_name
 		if [[ "$1" == "" ]]; then
 			container_name='cli'
@@ -891,6 +893,8 @@ _bash ()
 		fi
 		local container_id
 		container_id='$(docker-compose ps -q '$container_name')';
+		# Drop /cygdrive prefix if the working directory is opened as /cygdrive/<driveletter>/.. instead of /<driveletter>.. 
+		cwd=$(pwd); cwd=${cwd#/cygdrive}
 		command="cd $cwd && docker exec -it $container_id bash -i";
 		vagrant ssh -c "$command"
 		return

docs/system-requirements.md

@@ -24,7 +24,7 @@ Drude relies on the following components for Docker support on Mac and Windows:
 
 - [VirtualBox](https://www.virtualbox.org) 5.0+
 - [Vagrant](https://www.vagrantup.com) 1.7.3+
-- [Boot2docker Vagrant Box](https://github.com/blinkreaction/boot2docker-vagrant) v1.3.0+
+- [Boot2docker Vagrant Box](https://github.com/blinkreaction/boot2docker-vagrant) v1.3.1+
 
 **You do not have to install these components manually as Drude automates this for you.**  
 Please refer to the [setup instructions](/README.md#setup) for further steps.