[PATCH] xen: Fix the figlet banner

Andrew Cooper posted 1 patch 1 month, 2 weeks ago
Patches applied successfully (tree, apply log)
git fetch https://gitlab.com/xen-project/patchew/xen tags/patchew/20240722124842.4039445-1-andrew.cooper3@citrix.com
xen/build.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
[PATCH] xen: Fix the figlet banner
Posted by Andrew Cooper 1 month, 2 weeks ago
4.20 is just wide enough to cause figlet to split the banner onto two lines:

   __  __
   \ \/ /___ _ __
    \  // _ \ '_ \
    /  \  __/ | | |
   /_/\_\___|_| |_|

   _  _    ____   ___                     _        _     _
  | || |  |___ \ / _ \    _   _ _ __  ___| |_ __ _| |__ | | ___
  | || |_   __) | | | |__| | | | '_ \/ __| __/ _` | '_ \| |/ _ \
  |__   _| / __/| |_| |__| |_| | | | \__ \ || (_| | |_) | |  __/
     |_|(_)_____|\___/    \__,_|_| |_|___/\__\__,_|_.__/|_|\___|

Instruct figlet to use 100 column width, rather than 80, resulting in:

   __  __            _  _    ____   ___                     _        _     _
   \ \/ /___ _ __   | || |  |___ \ / _ \    _   _ _ __  ___| |_ __ _| |__ | | ___
    \  // _ \ '_ \  | || |_   __) | | | |__| | | | '_ \/ __| __/ _` | '_ \| |/ _ \
    /  \  __/ | | | |__   _| / __/| |_| |__| |_| | | | \__ \ || (_| | |_) | |  __/
   /_/\_\___|_| |_|    |_|(_)_____|\___/    \__,_|_| |_|___/\__\__,_|_.__/|_|\___|

While fixing this, also fix a rendering error in the non-figlet case; while a
leading space looks better for figlet, it looks very wrong for the simple
one-line case.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Jan Beulich <JBeulich@suse.com>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Julien Grall <julien@xen.org>
---
 xen/build.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xen/build.mk b/xen/build.mk
index 0f490ca71be1..942ff3867fdb 100644
--- a/xen/build.mk
+++ b/xen/build.mk
@@ -1,9 +1,9 @@
 quiet_cmd_banner = BANNER  $@
 define cmd_banner
     if command -v figlet >/dev/null 2>&1 ; then \
-	echo " Xen $(XEN_FULLVERSION)" | figlet -f $< > $@.tmp; \
+	echo " Xen $(XEN_FULLVERSION)" | figlet -w 100 -f $< > $@.tmp; \
     else \
-	echo " Xen $(XEN_FULLVERSION)" > $@.tmp; \
+	echo "Xen $(XEN_FULLVERSION)" > $@.tmp; \
     fi; \
     mv -f $@.tmp $@
 endef

base-commit: ff652ed5dcd797a46c84258255dfd429ae68a2d6
-- 
2.39.2
Re: [PATCH] xen: Fix the figlet banner
Posted by Jan Beulich 1 month, 2 weeks ago
On 22.07.2024 14:48, Andrew Cooper wrote:
> 4.20 is just wide enough to cause figlet to split the banner onto two lines:
> 
>    __  __
>    \ \/ /___ _ __
>     \  // _ \ '_ \
>     /  \  __/ | | |
>    /_/\_\___|_| |_|
> 
>    _  _    ____   ___                     _        _     _
>   | || |  |___ \ / _ \    _   _ _ __  ___| |_ __ _| |__ | | ___
>   | || |_   __) | | | |__| | | | '_ \/ __| __/ _` | '_ \| |/ _ \
>   |__   _| / __/| |_| |__| |_| | | | \__ \ || (_| | |_) | |  __/
>      |_|(_)_____|\___/    \__,_|_| |_|___/\__\__,_|_.__/|_|\___|
> 
> Instruct figlet to use 100 column width, rather than 80, resulting in:
> 
>    __  __            _  _    ____   ___                     _        _     _
>    \ \/ /___ _ __   | || |  |___ \ / _ \    _   _ _ __  ___| |_ __ _| |__ | | ___
>     \  // _ \ '_ \  | || |_   __) | | | |__| | | | '_ \/ __| __/ _` | '_ \| |/ _ \
>     /  \  __/ | | | |__   _| / __/| |_| |__| |_| | | | \__ \ || (_| | |_) | |  __/
>    /_/\_\___|_| |_|    |_|(_)_____|\___/    \__,_|_| |_|___/\__\__,_|_.__/|_|\___|
> 
> While fixing this, also fix a rendering error in the non-figlet case; while a
> leading space looks better for figlet, it looks very wrong for the simple
> one-line case.
> 
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

Reviewed-by: Jan Beulich <jbeulich@suse.com>