Reduced noise in detect-environment #2109
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The -u option enables unified diff which makes it look a little nicer. It uses +/- instead of </>. However, -u is not supported on HP-UX which causes the following output to be printed instead: ``` 21:28:47 ==================== Current environment ======================== 21:28:47 diff: illegal option -- u 21:28:47 usage: diff [ -C n ] [ -S name ] [ -bcefhilnrstw ] dir1 dir2 21:28:47 diff [-C n ] [ -bcefhintw ] file1 file2 21:28:47 diff [ -D string ] [ -biw ] file1 file2 21:28:47 ================================================================= ``` I also changed the output to only be printed if there is an actual change in the environment. This way, we won't print the environment every time this script is sourced. Ticket: ENT-12619 Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
This script is sourced many times and causes a lot of noise. All these log messages are redunant, in that the same information is printed in the end of the file. Ticket: ENT-12619 Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
Ticket: ENT-12619 Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
craigcomstock
requested changes
Feb 12, 2026
| if [ -n "$env_diff" ]; then | ||
| echo | ||
| echo | ||
| echo "==================== Current environment ========================" |
Contributor
There was a problem hiding this comment.
This should say instead "Changes to environment after sourcing this script" or similar. Nice!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.