Skip to content

Fix line endings in menu display output #3473

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

Merged
AjanZhong merged 3 commits into from
Dec 5, 2025
Merged

Fix line endings in menu display output #3473

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1378902
Fix line endings in menu display output
jelischer Dec 3, 2025
7a8b2f4
Fix an ordering issue in menu
jelischer Dec 4, 2025
97bdbd3
Merge branch 'main' into main
jelischer Dec 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions pkg/boot/menu/menu.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
package menu

import (
"bufio"
"fmt"
"io"
"log"
Expand Down Expand Up @@ -79,11 +80,16 @@ func SetInitialTimeout(timeout time.Duration) {
//
// not support SetTimeout/SetDeadline.
func Choose(term MenuTerminal, allowEdit bool, entries ...Entry) Entry {
fmt.Println("")
// Use a buffered writer to explicitly flush menu content before
// the terminal is put into raw mode for the prompt.
w := bufio.NewWriter(os.Stdout)
fmt.Fprintln(w, "")
for i, e := range entries {
fmt.Printf("%02d. %s\r\n\r\n", i+1, e.Label())
fmt.Fprintf(w, "%02d. %s\r\n\n", i+1, e.Label())
}
fmt.Println("\r")
fmt.Fprintln(w, "\r")
w.Flush()
time.Sleep(100 * time.Millisecond)

err := term.SetTimeout(initialTimeout)
if err != nil {
Expand Down Expand Up @@ -196,9 +202,9 @@ func ShowMenuAndLoad(allowEdit bool, entries ...Entry) Entry {
// The user is left to call Entry.Exec when this function returns.
func showMenuAndLoadFromFile(file *os.File, allowEdit bool, entries ...Entry) Entry {
// Clear the screen (ANSI terminal escape code for screen clear).
fmt.Printf("\033[1;1H\033[2J\n\n")
fmt.Printf("Welcome to LinuxBoot's Menu\n\n")
fmt.Printf("Enter a number to boot a kernel:\n")
fmt.Printf("\033[1;1H\033[2J\r\n\n")
fmt.Printf("Welcome to LinuxBoot's Menu\r\n\n")
fmt.Printf("Enter a number to boot a kernel:\r\n")

for {
t := NewTerminal(file)
Expand Down
Loading