From: Christoph Niedermaier <cniedermaier@dh-electronics.com>
Date: Wed, 23 Feb 2022 09:33:36 +0000 (+0100)
Subject: scripts/get_default_envs.sh: Remove blank lines
X-Git-Url: http://git.dujemihanovic.xyz/%22http:/www.sics.se/static/git-favicon.png?a=commitdiff_plain;h=7d79cba28ca9bb02ba589eca2e80ce837d7d0ca8;p=u-boot.git

scripts/get_default_envs.sh: Remove blank lines

After sorting, unnoticed blank lines at the end move to the top.
Avoid this by removing it before sorting.

Signed-off-by: Christoph Niedermaier <cniedermaier@dh-electronics.com>
Cc: Lukasz Majewski <lukma@denx.de>
Cc: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Cc: Tom Rini <trini@konsulko.com>
To: u-boot@lists.denx.de
---

diff --git a/scripts/get_default_envs.sh b/scripts/get_default_envs.sh
index 3c6fdc45e1..fedf7206fe 100755
--- a/scripts/get_default_envs.sh
+++ b/scripts/get_default_envs.sh
@@ -35,8 +35,8 @@ cp ${env_obj_file_path} ${ENV_OBJ_FILE_COPY}
 ${OBJCOPY} --dump-section .rodata.default_environment=${ENV_OBJ_FILE_COPY} \
 	${env_obj_file_path}
 
-# Replace default '\0' with '\n' and sort entries
-tr '\0' '\n' < ${ENV_OBJ_FILE_COPY} | sort --field-separator== -k1,1 --stable
+# Replace default '\0' with '\n' , remove blank lines and sort entries
+tr '\0' '\n' < ${ENV_OBJ_FILE_COPY} | sed -e '/^\s*$/d' | sort --field-separator== -k1,1 --stable
 
 rm ${ENV_OBJ_FILE_COPY}