Skip to content

Commit 494aa1f

Browse files
committed
detect-environment: Filter the output of env
The detect-environment script is quite noicy due to the fact that it prints the environment every time it's sourced. Hence, modified it to print only the environment variables that the script affects. Ticket: ENT-12600 Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
1 parent 860498b commit 494aa1f

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

build-scripts/detect-environment

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,11 @@ detect_environment
417417
echo
418418
echo
419419
echo "==================== Current environment ========================"
420-
env
420+
<<<<<<< Updated upstream
421+
env | grep -E "(label|CROSS_TARGET|UNAME|OS|DEP_PACKAGING|ARCH|MAKE|FUSER|PATCH|MAKEFLAGS)"
422+
=======
423+
env | grep -E "^(label|CROSS_TARGET|UNAME|OS|OS_VERSION|DEP_PACKAGING|ARCH|MAKE|FUSER|PATCH|MAKEFLAGS)="
424+
>>>>>>> Stashed changes
421425
echo "================================================================="
422426
echo
423427
echo

0 commit comments

Comments
 (0)