From 59f58b7fb24f4aec9d40b46b0133209f6c31cfb7 Mon Sep 17 00:00:00 2001 From: ohair Date: Mon, 31 Mar 2008 17:20:48 -0700 Subject: [PATCH] 6501543: Username can have non-alphanumeric characters Summary: User version string issues, including a L10n issue with month names. Reviewed-by: tbell --- make/common/shared/Defs.gmk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/make/common/shared/Defs.gmk b/make/common/shared/Defs.gmk index 6b0adfcb5..811c87df1 100644 --- a/make/common/shared/Defs.gmk +++ b/make/common/shared/Defs.gmk @@ -265,7 +265,9 @@ ifdef BUILD_NUMBER FULL_VERSION = $(RELEASE)-$(BUILD_NUMBER) else BUILD_NUMBER = b00 - USER_RELEASE_SUFFIX := $(shell echo $(USER)_`date '+%d_%b_%Y_%H_%M' | tr "A-Z" "a-z"`) + BUILD_DATE := $(shell $(DATE) '+%Y_%m_%d_%H_%M') + CLEAN_USERNAME := $(shell $(ECHO) "$(USER)" | $(TR) -d -c '[:alnum:]') + USER_RELEASE_SUFFIX := $(shell $(ECHO) "$(CLEAN_USERNAME)_$(BUILD_DATE)" | $(TR) '[:upper:]' '[:lower:]' ) FULL_VERSION = $(RELEASE)-$(USER_RELEASE_SUFFIX)-$(BUILD_NUMBER) endif -- GitLab