Skip to content

Commit bbeef1d

Browse files
committed
Make it more explicit that matter is being executed on grub updates
1 parent 21ff16f commit bbeef1d

File tree

3 files changed

+18
-10
lines changed

3 files changed

+18
-10
lines changed

Matter/theme.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
title-text: ""
1212
# desktop-image: "background.png"
1313
desktop-color: "#263238"
14-
terminal-font: "Unifont Regular 16"
14+
terminal-font: "default" # a random name to let the default font for the console
1515
terminal-box: "terminal_box_*.png"
1616
terminal-left: "0"
1717
terminal-top: "0"
@@ -25,9 +25,9 @@ terminal-border: "0"
2525
top = 29%
2626
width = 28%
2727
height = 60%
28-
item_font = "GoogleSans Regular 32"
29-
item_color = "#cccccc"
30-
selected_item_color = "#E91E63"
28+
item_font = "Google Sans Regular 32"
29+
item_color = "#ffffff"
30+
selected_item_color = "#e91e63"
3131
icon_width = 72
3232
icon_height = 72
3333
item_height = 72
@@ -43,6 +43,6 @@ terminal-border: "0"
4343
align = "center"
4444
id = "__timeout__"
4545
text = "Booting in %d seconds"
46-
color = "#cccccc"
47-
font = "GoogleSans Regular 32"
46+
color = "#ffffff"
47+
font = "Google Sans Regular 32"
4848
}

hookcheck.py.template

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,19 @@ BEGIN_THEME_OVERRIDES = "{BEGIN_THEME_OVERRIDES}"
3333
END_THEME_OVERRIDES = "{END_THEME_OVERRIDES}"
3434
SETICONS_CALL = "{SETICONS_CALL}"
3535

36-
36+
cyan = "\033[36m"
37+
pink = "\033[38;5;206m"
38+
endcolor ="\033[0m"
3739
def info(msg):
3840
# info with cyan [I]
39-
print(f"\033[36m[I]\033[0m {{msg}}", file=stderr)
41+
print(f"{{cyan}}[I]{{endcolor}} {{msg}}", file=stderr)
4042

4143

4244
def sh(command):
4345
"Executes command in shell and returns its exit status"
4446
return run(command, shell=True).returncode
4547

48+
info(f"{{pink}}[Matter]{{endcolor}} Setting entry icons")
4649

4750
with open(GRUB_MKCONFIG_PATH, "r", newline="") as f:
4851
grub_mkconfig = f.read()

matter.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
def color_string(string, fg=None):
2727
COLORS = { # List some colors that may be needed
2828
"red": "\033[31m",
29+
"pink": "\033[38;5;206m",
2930
"green": "\033[32m",
3031
"orange": "\033[33m",
3132
"blue": "\033[34m",
@@ -35,6 +36,8 @@ def color_string(string, fg=None):
3536
"yellow": "\033[93m",
3637
"lightblue": "\033[94m",
3738
"lightcyan": "\033[96m",
39+
"brightwhite": "\u001b[37;1m",
40+
"brightmagenta": "\u001b[35;1m",
3841
}
3942
endcolor = "\033[0m"
4043
return f"{COLORS.get(fg, '')}{string}{endcolor}"
@@ -478,8 +481,10 @@ def get_entry_names(grub_cfg):
478481

479482
def do_preinstall_hint():
480483
info(
481-
f"[{color_string(THEME_NAME.upper(), fg='pink')} "
482-
f"{color_string('Grub Theme'.upper(), fg='orange')}]"
484+
f"{color_string('[ ', fg='brightwhite')}"
485+
f"{color_string(THEME_NAME, fg='brightmagenta')} "
486+
f"{color_string('Grub Theme'.upper(), fg='lightcyan')}"
487+
f"{color_string(' ]', fg='brightwhite')}"
483488
)
484489
info("Argument -i required. Which icons go to which grub entries?.")
485490
info("Your grub entries are:")

0 commit comments

Comments
 (0)