Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cli: Fix DEFAULT_OVERLAYS array #6746

Merged
merged 1 commit into from
Jun 16, 2024
Merged

cli: Fix DEFAULT_OVERLAYS array #6746

merged 1 commit into from
Jun 16, 2024

Conversation

ColorfulRhino
Copy link
Collaborator

@ColorfulRhino ColorfulRhino commented Jun 14, 2024 •
edited
Loading

Description

Shellcheck errors/warnings were:

In lib/functions/rootfs/distro-agnostic.sh line 155:
                        display_alert "Adding to extlinux.conf" "fdtoverlays=${DEFAULT_OVERLAYS[@]}" "debug"
                                                                             ^--------------------^ SC2145 (error): Argument mixes string and array. Use * or separate argument.

In lib/functions/rootfs/distro-agnostic.sh line 156:
                        echo "  fdtoverlays ${DEFAULT_OVERLAYS[@]}" >> "$SDCARD/boot/extlinux/extlinux.conf"
                                            ^--------------------^ SC2145 (error): Argument mixes string and array. Use * or separate argument.

In lib/functions/rootfs/distro-agnostic.sh line 193:
                if [[ -n $DEFAULT_OVERLAYS && -f "${SDCARD}"/boot/armbianEnv.txt ]]; then
                         ^---------------^ SC2128 (warning): Expanding an array without an index only gives the first element.

Fixes #6744

How it was tested

@ColorfulRhino ColorfulRhino requested a review from a team as a code owner June 14, 2024 21:18
@github-actions github-actions bot added the size/small PR with less then 50 lines label Jun 14, 2024
@ColorfulRhino ColorfulRhino mentioned this pull request Jun 14, 2024
Merged
6 tasks
@ColorfulRhino @efectn
cli: Fix DEFAULT_OVERLAYS array
8cca584 
Shellcheck errors/warnings were:
In lib/functions/rootfs/distro-agnostic.sh line 155:
	display_alert "Adding to extlinux.conf" "fdtoverlays=${DEFAULT_OVERLAYS[@]}" "debug"
                                                         ^--------------------^ SC2145 (error): Argument mixes string and array. Use * or separate argument.

In lib/functions/rootfs/distro-agnostic.sh line 156:
	echo "  fdtoverlays ${DEFAULT_OVERLAYS[@]}" >> "$SDCARD/boot/extlinux/extlinux.conf"
                        ^--------------------^ SC2145 (error): Argument mixes string and array. Use * or separate argument.

In lib/functions/rootfs/distro-agnostic.sh line 193:
	if [[ -n $DEFAULT_OVERLAYS && -f "${SDCARD}"/boot/armbianEnv.txt ]]; then
             ^---------------^ SC2128 (warning): Expanding an array without an index only gives the first element.
@ColorfulRhino ColorfulRhino merged commit 0bf3ba7 into armbian:main Jun 16, 2024
7 checks passed
@ColorfulRhino ColorfulRhino deleted the fix-overlay-stuff branch June 16, 2024 12:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@efectn efectn efectn approved these changes

Assignees
No one assigned
Labels
size/small PR with less then 50 lines
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ColorfulRhino @efectn