From e23200c25751f9d42054e99b13b264cd45c4537d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=88=D0=BE=D0=B2=D0=B0=D0=BD=20=D0=82=D0=BE=D0=BA=D0=B8?= =?UTF-8?q?=D1=9B-=D0=A8=D1=83=D0=BC=D0=B0=D1=80=D0=B0=D1=86?= Date: Thu, 20 May 2021 00:53:11 +0200 Subject: [PATCH] Added Arco --- Makefile | 2 +- fetchy | Bin 0 -> 21808 bytes fetchy.c | 8 +++++--- logos.h | 59 +++++++++++++++++++++++++++++++++++-------------------- 4 files changed, 44 insertions(+), 25 deletions(-) create mode 100755 fetchy diff --git a/Makefile b/Makefile index 6724ab4..27c2969 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ CFLAGS = -lm all: fetchy -fetchy: +fetchy: fetchy.c $(CC) $(CFLAGS) fetchy.c -o $@ clean: diff --git a/fetchy b/fetchy new file mode 100755 index 0000000000000000000000000000000000000000..d804b073b7bf98d3d7b024ebae9c4f4837683b83 GIT binary patch literal 21808 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 literal 0 HcmV?d00001 diff --git a/fetchy.c b/fetchy.c index 91e9cca..9985c46 100644 --- a/fetchy.c +++ b/fetchy.c @@ -190,8 +190,9 @@ static char *get_sys(char *sys, char *os_name){ snprintf(os_name, BUF_SIZE, "\x1b[36mOS\x1b[0m -> %s Linux", name); - if ( !strcmp( name, "Arch") || !strcmp( name, "Arco") ) *sys = 'a'; - if ( !strcmp( name, "Artix") ) *sys = 'x'; + if ( !strcmp( name, "Arch") ) *sys = 'a'; + if ( !strcmp( name, "Artix") ) *sys = 'x'; + if ( !strcmp( name, "Arco") ) *sys = 'r'; if ( !strcmp( name, "Debian")) *sys = 'd'; if ( !strcmp( name, "Ubuntu")) *sys = 'u'; @@ -271,7 +272,7 @@ static char *get_kernel(char *kern_name){ fclose(kInfo); truncate_spaces_leading(kernel); - snprintf(kern_name, BUF_SIZE + 5, "\x1b[36mKRNL\x1b[0m -> Linux %s", kernel); + snprintf(kern_name, BUF_SIZE + 5, "\x1b[36mKERN\x1b[0m -> Linux %s", kernel); free(kernel); return kern_name; @@ -318,6 +319,7 @@ static char *get_packages(char *package_count, char sys){ switch (sys){ + case 'r': case 'x': case 'a': diff --git a/logos.h b/logos.h index 4c3fdf9..86c63df 100644 --- a/logos.h +++ b/logos.h @@ -31,13 +31,13 @@ void concatenate_and_print(char sys, char *os, char *cpu_name, char *gpu){ case 'x': printf("\n"); - printf(" /\\ %s\n", os); - printf(" / \\ %s\n", get_kernel(kern_name)); - printf(" /`'.,\\ %s\n", get_uptime(uptime)); - printf(" / ', %s\n", get_packages(package_count, sys)); - printf(" / ,`\\ %s\n", cpu_name); - printf(" / ,.'`. \\ %s\n", gpu); - printf(" /.,'` `'.\\ %s\n", get_RAM(ram_info)); + printf("\x1b[1m /\\ %s\n", os); + printf("\x1b[1m / \\ %s\n", get_kernel(kern_name)); + printf("\x1b[1m /`'.,\\ %s\n", get_uptime(uptime)); + printf("\x1b[1m / ', %s\n", get_packages(package_count, sys)); + printf("\x1b[1m / ,`\\ %s\n", cpu_name); + printf("\x1b[1m / ,.'`. \\ %s\n", gpu); + printf("\x1b[1m /.,'` `'.\\ %s\n", get_RAM(ram_info)); printf("\n\n"); break; @@ -47,13 +47,13 @@ void concatenate_and_print(char sys, char *os, char *cpu_name, char *gpu){ case 'd': printf("\n"); - printf(" _____ %s\n", os); - printf(" / __ \\ %s\n", get_kernel(kern_name)); - printf(" | / | %s\n", get_uptime(uptime)); - printf(" | \\___- %s\n", get_packages(package_count, sys)); - printf(" -_ %s\n", cpu_name); - printf(" --_ %s\n", gpu); - printf(" %s\n", get_RAM(ram_info)); + printf("\x1b[1m _____ %s\n", os); + printf("\x1b[1m / __ \\ %s\n", get_kernel(kern_name)); + printf("\x1b[1m | / | %s\n", get_uptime(uptime)); + printf("\x1b[1m | \\___- %s\n", get_packages(package_count, sys)); + printf("\x1b[1m -_ %s\n", cpu_name); + printf("\x1b[1m --_ %s\n", gpu); + printf("\x1b[1m %s\n", get_RAM(ram_info)); printf("\n\n"); break; @@ -63,13 +63,30 @@ void concatenate_and_print(char sys, char *os, char *cpu_name, char *gpu){ case 'u': printf("\n"); - printf(" %s\n", os); - printf(" ---(_) %s\n", get_kernel(kern_name)); - printf(" _/ --- \\ %s\n", get_uptime(uptime)); - printf("(_) | | %s\n", get_packages(package_count, sys)); - printf(" \\ --- / %s\n", cpu_name); - printf(" ---(_) %s\n", gpu); - printf(" %s\n", get_RAM(ram_info)); + printf("\x1b[1m _ %s\n", os); + printf("\x1b[1m ---(_) %s\n", get_kernel(kern_name)); + printf("\x1b[1m _/ --- \\ %s\n", get_uptime(uptime)); + printf("\x1b[1m (_) | | %s\n", get_packages(package_count, sys)); + printf("\x1b[1m \\ --- / %s\n", cpu_name); + printf("\x1b[1m ---(_) %s\n", gpu); + printf("\x1b[1m %s\n", get_RAM(ram_info)); + printf("\n\n"); + + break; + + + + + case 'r': + + printf("\n"); + printf("\x1b[1m /\\ %s\n", os); + printf("\x1b[1m / \\ %s\n", get_kernel(kern_name)); + printf("\x1b[1m / /\\ \\ %s\n", get_uptime(uptime)); + printf("\x1b[1m / / \\ \\ %s\n", get_packages(package_count, sys)); + printf("\x1b[1m / / \\ \\ %s\n", cpu_name); + printf("\x1b[1m / / _____\\ \\ %s\n", gpu); + printf("\x1b[1m /_/ \\`----.\\_\\ %s\n", get_RAM(ram_info)); printf("\n\n"); break;