From b5e8109e1c683f6295dda3e7014ee15a2f9b252d Mon Sep 17 00:00:00 2001 From: AloneER0 Date: Sun, 18 Sep 2022 00:46:15 +0200 Subject: [PATCH 1/7] Crystal logo --- src/logo/builtin.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/src/logo/builtin.c b/src/logo/builtin.c index b267e0cd86..49eacc7e88 100644 --- a/src/logo/builtin.c +++ b/src/logo/builtin.c @@ -522,6 +522,45 @@ static const FFlogo* getLogoCentOSSmall() FF_LOGO_RETURN } +static const FFlogo* getLogoCrystalLinux() +{ + FF_LOGO_INIT + FF_LOGO_NAMES("crystal", "Crystal", "crystal-linux", "Crystal-Linux") + FF_LOGO_LINES( + + " mysssym\n" + " mysssym\n" + " mysssym\n" + " mysssym\n" + " mysssyd\n" + " mysssyd N\n" + " mysssyd mysym\n" + " mysssyd dysssym\n" + " mysssyd dysssym\n" + " mysssyd dysssym\n" + " mysssyd dysssym\n" + " mysssyd dysssym\n" + " mysssyd dysssym\n" + " mysym dysssym\n" + " N dysssym\n" + " dysssym\n" + " dysssym\n" + " dysssym\n" + " dysssym\n" + " dysssym\n" + ) + + FF_LOGO_COLORS( + "35", //magenta + "30" //black + ) + FF_LOGO_COLOR_KEYS("36"); //cyan + FF_LOGO_COLOR_TITLE("34"); //blue + FF_LOGO_RETURN +} + + + static const FFlogo* getLogoDebian() { FF_LOGO_INIT @@ -1898,6 +1937,7 @@ GetLogoMethod* ffLogoBuiltinGetAll() getLogoCelOS, getLogoCentOS, getLogoCentOSSmall, + getLogoCrystalLinux, getLogoDebian, getLogoDevuan, getLogoDevuanSmall, From 5f8a27faa53c1beba2131d4a1638119ac478dff9 Mon Sep 17 00:00:00 2001 From: AloneER0 <92590433+AloneER0@users.noreply.github.com> Date: Sun, 18 Sep 2022 00:59:53 +0200 Subject: [PATCH 2/7] Update builtin.c --- src/logo/builtin.c | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/src/logo/builtin.c b/src/logo/builtin.c index 49eacc7e88..89afe4d921 100644 --- a/src/logo/builtin.c +++ b/src/logo/builtin.c @@ -527,28 +527,26 @@ static const FFlogo* getLogoCrystalLinux() FF_LOGO_INIT FF_LOGO_NAMES("crystal", "Crystal", "crystal-linux", "Crystal-Linux") FF_LOGO_LINES( - - " mysssym\n" - " mysssym\n" - " mysssym\n" - " mysssym\n" - " mysssyd\n" - " mysssyd N\n" - " mysssyd mysym\n" - " mysssyd dysssym\n" - " mysssyd dysssym\n" - " mysssyd dysssym\n" - " mysssyd dysssym\n" - " mysssyd dysssym\n" - " mysssyd dysssym\n" - " mysym dysssym\n" - " N dysssym\n" - " dysssym\n" - " dysssym\n" - " dysssym\n" - " dysssym\n" - " dysssym\n" - ) +" mysssym\n" +" mysssym\n" +" mysssym\n" +" mysssym\n" +" mysssyd\n" +" mysssyd N\n" +" mysssyd mysym\n" +" mysssyd dysssym\n" +" mysssyd dysssym\n" +" mysssyd dysssym\n" +" mysssyd dysssym\n" +" mysssyd dysssym\n" +" mysssyd dysssym\n" +" mysym dysssym\n" +" N dysssym\n" +" dysssym\n" +" dysssym\n" +" dysssym\n" +" dysssym\n" +" dysssym\n" FF_LOGO_COLORS( "35", //magenta From 42d314b2001cc1db4409462f524ba7fad2451d07 Mon Sep 17 00:00:00 2001 From: AloneER0 Date: Sun, 18 Sep 2022 01:01:48 +0200 Subject: [PATCH 3/7] Fixed logo --- src/logo/builtin.c | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/src/logo/builtin.c b/src/logo/builtin.c index 49eacc7e88..6c71114919 100644 --- a/src/logo/builtin.c +++ b/src/logo/builtin.c @@ -527,27 +527,28 @@ static const FFlogo* getLogoCrystalLinux() FF_LOGO_INIT FF_LOGO_NAMES("crystal", "Crystal", "crystal-linux", "Crystal-Linux") FF_LOGO_LINES( +" mysssym\n" +" mysssym\n" +" mysssym\n" +" mysssym\n" +" mysssyd\n" +" mysssyd N\n" +" mysssyd mysym\n" +" mysssyd dysssym\n" +" mysssyd dysssym\n" +" mysssyd dysssym\n" +" mysssyd dysssym\n" +" mysssyd dysssym\n" +" mysssyd dysssym\n" +" mysym dysssym\n" +" N dysssym\n" +" dysssym\n" +" dysssym\n" +" dysssym\n" +" dysssym\n" +" dysssym\n" + - " mysssym\n" - " mysssym\n" - " mysssym\n" - " mysssym\n" - " mysssyd\n" - " mysssyd N\n" - " mysssyd mysym\n" - " mysssyd dysssym\n" - " mysssyd dysssym\n" - " mysssyd dysssym\n" - " mysssyd dysssym\n" - " mysssyd dysssym\n" - " mysssyd dysssym\n" - " mysym dysssym\n" - " N dysssym\n" - " dysssym\n" - " dysssym\n" - " dysssym\n" - " dysssym\n" - " dysssym\n" ) FF_LOGO_COLORS( From 5f9e0afea61f8c2893a29aac436af15f9ee9ea60 Mon Sep 17 00:00:00 2001 From: AloneER0 <92590433+AloneER0@users.noreply.github.com> Date: Sun, 18 Sep 2022 16:13:08 +0200 Subject: [PATCH 4/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8dbec36fed..3afa5b1ed2 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ Title, Separator, OS, Host, Kernel, Uptime, Processes, Packages, Shell, Resoluti ##### Logos ``` -AlmaLinux, Alpine, Android, Arch, Arco, Artix, Bedrock, CachyOS, CentOS, Debian, Devuan, Deepin, Endeavour, Fedora, Garuda, Gentoo, KDE Neon, KISS, Kubuntu, LangitKetujuh, Linux, MacOS, Manjaro, Mint, MSYS2, NixOS, OpenSUSE, OpenSUSE Tumbleweed, OpenSUSE LEAP, Pop!_OS, RebornOS, RedstarOS, Rocky, Rosa, Slackware, Ubuntu, Void, Zorin +AlmaLinux, Alpine, Android, Arch, Arco, Artix, Bedrock, CachyOS, CentOS, Crystal, Debian, Devuan, Deepin, Endeavour, Fedora, Garuda, Gentoo, KDE Neon, KISS, Kubuntu, LangitKetujuh, Linux, MacOS, Manjaro, Mint, MSYS2, NixOS, OpenSUSE, OpenSUSE Tumbleweed, OpenSUSE LEAP, Pop!_OS, RebornOS, RedstarOS, Rocky, Rosa, Slackware, Ubuntu, Void, Zorin ``` * Most of the logos have a small variant. Access it by appending _small to the logo name. * Some logos have an old variant. Access it by appending _old to the logo name. From 6abb8ee093b3f1ef8683b4b79fdb5b5e50fe8e00 Mon Sep 17 00:00:00 2001 From: AloneER0 Date: Sun, 18 Sep 2022 16:19:47 +0200 Subject: [PATCH 5/7] Removed patch code --- src/logo/builtin.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/logo/builtin.c b/src/logo/builtin.c index 049c0d99fb..e528d171e7 100644 --- a/src/logo/builtin.c +++ b/src/logo/builtin.c @@ -546,15 +546,9 @@ static const FFlogo* getLogoCrystalLinux() " dysssym\n" " dysssym\n" " dysssym\n" -<<<<<<< HEAD " dysssym\n" - ) -======= -" dysssym\n" ->>>>>>> 5f8a27faa53c1beba2131d4a1638119ac478dff9 - FF_LOGO_COLORS( "35", //magenta "30" //black From 1ce4bff7d5dfa6d22a0b50352b57841788335ea0 Mon Sep 17 00:00:00 2001 From: AloneER0 Date: Sun, 18 Sep 2022 16:21:24 +0200 Subject: [PATCH 6/7] Removed black git push --- src/logo/builtin.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/logo/builtin.c b/src/logo/builtin.c index e528d171e7..8ade1a6bf5 100644 --- a/src/logo/builtin.c +++ b/src/logo/builtin.c @@ -551,7 +551,6 @@ static const FFlogo* getLogoCrystalLinux() FF_LOGO_COLORS( "35", //magenta - "30" //black ) FF_LOGO_COLOR_KEYS("36"); //cyan FF_LOGO_COLOR_TITLE("34"); //blue From d010de03c05572bdf3fb2729618b34e1fe77a923 Mon Sep 17 00:00:00 2001 From: AloneER0 Date: Sun, 18 Sep 2022 16:46:42 +0200 Subject: [PATCH 7/7] Fixed build --- src/logo/builtin.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/logo/builtin.c b/src/logo/builtin.c index 8ade1a6bf5..e819ff1871 100644 --- a/src/logo/builtin.c +++ b/src/logo/builtin.c @@ -546,14 +546,14 @@ static const FFlogo* getLogoCrystalLinux() " dysssym\n" " dysssym\n" " dysssym\n" -" dysssym\n" - +" dysssym\n"; + ) FF_LOGO_COLORS( - "35", //magenta + "35" //magenta ) - FF_LOGO_COLOR_KEYS("36"); //cyan - FF_LOGO_COLOR_TITLE("34"); //blue + FF_LOGO_COLOR_KEYS("35"); //magenta + FF_LOGO_COLOR_TITLE("35"); //magenta FF_LOGO_RETURN }