Fix CR bug in crudini usage

alexpilotti · alexpilotti · commit 5b582c5bba5a · 2013-10-26T19:33:50.000+03:00
diff --git a/utils.sh b/utils.sh
@@ -133,7 +133,8 @@ get_openstack_option_value () {
     CONFIG_FILE_PATH=$4
 
     # Return an empty result if the value is not found
-    run_ssh_cmd_with_retry $SSHUSER_HOST "crudini --get $CONFIG_FILE_PATH $SECTION_NAME $OPTION_NAME 2> /dev/null || if [ \"\$?\" == \"1\" ]; then true; else false; fi"
+    # TODO: improve the hack that removes the trailing '\r\n'
+    run_ssh_cmd_with_retry $SSHUSER_HOST "crudini --get $CONFIG_FILE_PATH $SECTION_NAME $OPTION_NAME 2> /dev/null || if [ \"\$?\" == \"1\" ]; then true; else false; fi" | tr -d '\r'
 }
 
 configure_ssh_pubkey_auth () {

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,8 @@ get_openstack_option_value () {`
`133`	`133`	`CONFIG_FILE_PATH=$4`
`134`	`134`
`135`	`135`	`# Return an empty result if the value is not found`
`136`		`- run_ssh_cmd_with_retry $SSHUSER_HOST "crudini --get $CONFIG_FILE_PATH $SECTION_NAME $OPTION_NAME 2> /dev/null \|\| if [ \"\$?\" == \"1\" ]; then true; else false; fi"`
	`136`	`+ # TODO: improve the hack that removes the trailing '\r\n'`
	`137`	`+ run_ssh_cmd_with_retry $SSHUSER_HOST "crudini --get $CONFIG_FILE_PATH $SECTION_NAME $OPTION_NAME 2> /dev/null \|\| if [ \"\$?\" == \"1\" ]; then true; else false; fi" \| tr -d '\r'`
`137`	`138`	`}`
`138`	`139`
`139`	`140`	`configure_ssh_pubkey_auth () {`