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 0000000..d804b07 Binary files /dev/null and b/fetchy differ 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;