This is an automated email from the ASF dual-hosted git repository.
rabbah pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-devtools.git
The following commit(s) were added to refs/heads/master by this push:
new 0ded61e fixed localization problem (#283)
0ded61e is described below
commit 0ded61e8432211312a6b507f6b96761b62be7bdf
Author: AnBo <[email protected]>
AuthorDate: Mon Aug 19 10:45:15 2019 +0200
fixed localization problem (#283)
The command was not robust with respect to the localization of the current
shell (e.g., in a German shell the output is "inet Adresse:" instead of "inet
addr:"). Adding the language attribute solves this issue.
---
docker-compose/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docker-compose/Makefile b/docker-compose/Makefile
index de8ff6a..7577eb1 100644
--- a/docker-compose/Makefile
+++ b/docker-compose/Makefile
@@ -2,7 +2,7 @@ UNAME_STR ?= $(shell uname)
# detect local ip of host as this is needed within containers to find the
OpenWhisk API container
ifeq ("$(UNAME_STR)","Linux")
- LOCAL_IP=$(shell route | grep default | tr -s " " | cut -d " " -f 8 |
xargs /sbin/ifconfig | grep "inet addr:" | cut -d ":" -f 2 | cut -d " " -f 1)
+ LOCAL_IP=$(shell LANG=en_US.utf8; route | grep default | tr -s " " |
cut -d " " -f 8 | xargs /sbin/ifconfig | grep "inet addr:" | cut -d ":" -f 2 |
cut -d " " -f 1)
# inet addr: not present, trying with inet.
ifeq ($(LOCAL_IP), )
LOCAL_IP=$(shell route | grep default | tr -s " " | cut -d " "
-f 8 | xargs /sbin/ifconfig | grep "inet " | tr -s " " | cut -d " " -f 3)
