Optionally pass cqlshrc file from environment

eevans · eevans · commit 023a0f632f0f · 2018-03-14T10:41:49.000-05:00
diff --git a/c-cqlsh b/c-cqlsh
@@ -15,6 +15,7 @@ assert_instance_exists "$ID"
 shift 1
 
 CONFDIR=`config_directory $ID`
+CQLSHRC=${CQLSHRC:-"$CONFDIR"/cqlshrc}
 
 use_ssl()
 {
@@ -26,4 +27,4 @@ use_ssl()
 }
 
 
-sudo cqlsh --cqlshrc="$CONFDIR"/cqlshrc `use_ssl` `listen_hostname $ID` "$@"
+sudo cqlsh --cqlshrc="$CQLSHRC" `use_ssl` `listen_hostname $ID` "$@"

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ assert_instance_exists "$ID"`
`15`	`15`	`shift 1`
`16`	`16`
`17`	`17`	CONFDIR=`config_directory $ID`
	`18`	`+CQLSHRC=${CQLSHRC:-"$CONFDIR"/cqlshrc}`
`18`	`19`
`19`	`20`	`use_ssl()`
`20`	`21`	`{`
`@@ -26,4 +27,4 @@ use_ssl()`
`26`	`27`	`}`
`27`	`28`
`28`	`29`
`29`		-sudo cqlsh --cqlshrc="$CONFDIR"/cqlshrc `use_ssl` `listen_hostname $ID` "$@"
	`30`	+sudo cqlsh --cqlshrc="$CQLSHRC" `use_ssl` `listen_hostname $ID` "$@"