Skip to content

Commit 3b4a3a0

Browse files
ownianathanchance
authored andcommitted
scripts: kconfig: merge_config.sh: fix unexpected operator warning
Fix a warning for: $ ./scripts/kconfig/merge_config.sh .config extra.config Using .config as base Merging extra.config ./scripts/kconfig/merge_config.sh: 384: [: false: unexpected operator The shellcheck report is also attached: if [ "$STRICT" == "true" ] && [ "$STRICT_MODE_VIOLATED" == "true" ]; then ^-- SC3014 (warning): In POSIX sh, == in place of = is undefined. ^-- SC3014 (warning): In POSIX sh, == in place of = is undefined. Fixes: dfc97e1 ("scripts: kconfig: merge_config.sh: use awk in checks too") Signed-off-by: Weizhao Ouyang <[email protected]> Reviewed-by: Mikko Rapeli <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Nathan Chancellor <[email protected]>
1 parent a76e30c commit 3b4a3a0

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

scripts/kconfig/merge_config.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ END {
381381
STRICT_MODE_VIOLATED=true
382382
fi
383383

384-
if [ "$STRICT" == "true" ] && [ "$STRICT_MODE_VIOLATED" == "true" ]; then
384+
if [ "$STRICT" = "true" ] && [ "$STRICT_MODE_VIOLATED" = "true" ]; then
385385
echo "Requested and effective config differ"
386386
exit 1
387387
fi

0 commit comments

Comments
 (0)