Merge pull request #178 from fuzzbomb/177-mysql-commands-broken-since-dsh-v1.21.1

Leonid Makarov · web-flow · commit 6a4b7a5a5187 · 2016-10-17T20:18:50.000-07:00
Restore use of DRUDE_IS_TTY=0 in get_mysql_connect (fixes #177)
diff --git a/bin/dsh b/bin/dsh
@@ -141,8 +141,10 @@ clean_string ()
 get_mysql_connect ()
 {
 	# Run drush forcing tty to false to avoid colored output string from drush.
-	cleaned_string=$(echo $(_run drush sql-connect) | sed -e 's/[^a-zA-Z0-9_-]$//')
-	echo "$cleaned_string"
+	# Removes invisible residue from the connection string that remains
+	#leftover in Babun+docker-compose sometimes.
+	connection_string=$(echo $(DRUDE_IS_TTY=0 _run drush sql-connect) | sed -e 's/[^a-zA-Z0-9_-]$//')
+	echo ${connection_string}
 }
 
 # Use this function for every docker-compose invocation.

Original file line number	Diff line number	Diff line change
`@@ -141,8 +141,10 @@ clean_string ()`
`141`	`141`	`get_mysql_connect ()`
`142`	`142`	`{`
`143`	`143`	`# Run drush forcing tty to false to avoid colored output string from drush.`
`144`		`- cleaned_string=$(echo $(_run drush sql-connect) \| sed -e 's/[^a-zA-Z0-9_-]$//')`
`145`		`- echo "$cleaned_string"`
	`144`	`+ # Removes invisible residue from the connection string that remains`
	`145`	`+ #leftover in Babun+docker-compose sometimes.`
	`146`	`+ connection_string=$(echo $(DRUDE_IS_TTY=0 _run drush sql-connect) \| sed -e 's/[^a-zA-Z0-9_-]$//')`
	`147`	`+ echo ${connection_string}`
`146`	`148`	`}`
`147`	`149`
`148`	`150`	`# Use this function for every docker-compose invocation.`