diff options
| author | Jean-Sébastien Pédron <[email protected]> | 2019-06-17 14:11:37 +0200 |
|---|---|---|
| committer | Jean-Sébastien Pédron <[email protected]> | 2019-06-17 14:11:37 +0200 |
| commit | 32d1ab322bc7f7db5a1e03683de17908e3112aa6 (patch) | |
| tree | f5292ad3ee030fbea0545dcc59d04a44e247bcef | |
| parent | f50fb91fabc11ae62ed1d4920a350ebf6858dbfd (diff) | |
| download | erlang.mk-32d1ab322bc7f7db5a1e03683de17908e3112aa6.tar.gz erlang.mk-32d1ab322bc7f7db5a1e03683de17908e3112aa6.tar.bz2 erlang.mk-32d1ab322bc7f7db5a1e03683de17908e3112aa6.zip | |
Set locale to `C` when checking bootstrapped app name
At least on FreeBSD, the `en_US.UTF-8` locale I use breaks the check. It
might be a bug on FreeBSD because I don't understand why it would affect
the behaviour of that simple regex. Nonetheless, let's override the
locale to make sure this does not happen again.
| -rw-r--r-- | plugins/bootstrap.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/bootstrap.mk b/plugins/bootstrap.mk index 6321085..23dd238 100644 --- a/plugins/bootstrap.mk +++ b/plugins/bootstrap.mk @@ -411,7 +411,7 @@ ifneq ($(wildcard src/),) $(error Error: src/ directory already exists) endif $(eval p := $(PROJECT)) - $(if $(shell echo $p | grep -x "[a-z0-9_]*"),,\ + $(if $(shell echo $p | LC_ALL=C grep -x "[a-z0-9_]*"),,\ $(error Error: Invalid characters in the application name)) $(eval n := $(PROJECT)_sup) $(verbose) $(call core_render,bs_Makefile,Makefile) @@ -428,7 +428,7 @@ ifneq ($(wildcard src/),) $(error Error: src/ directory already exists) endif $(eval p := $(PROJECT)) - $(if $(shell echo $p | grep -x "[a-z0-9_]*"),,\ + $(if $(shell echo $p | LC_ALL=C grep -x "[a-z0-9_]*"),,\ $(error Error: Invalid characters in the application name)) $(verbose) $(call core_render,bs_Makefile,Makefile) $(verbose) echo "include erlang.mk" >> Makefile @@ -458,7 +458,7 @@ ifneq ($(wildcard $(APPS_DIR)/$in),) $(error Error: Application $in already exists) endif $(eval p := $(in)) - $(if $(shell echo $p | grep -x "[a-z0-9_]*"),,\ + $(if $(shell echo $p | LC_ALL=C grep -x "[a-z0-9_]*"),,\ $(error Error: Invalid characters in the application name)) $(eval n := $(in)_sup) $(verbose) mkdir -p $(APPS_DIR)/$p/src/ @@ -477,7 +477,7 @@ ifneq ($(wildcard $(APPS_DIR)/$in),) $(error Error: Application $in already exists) endif $(eval p := $(in)) - $(if $(shell echo $p | grep -x "[a-z0-9_]*"),,\ + $(if $(shell echo $p | LC_ALL=C grep -x "[a-z0-9_]*"),,\ $(error Error: Invalid characters in the application name)) $(verbose) mkdir -p $(APPS_DIR)/$p/src/ $(verbose) $(call core_render,bs_apps_Makefile,$(APPS_DIR)/$p/Makefile) |