From 54491b7e71c759a7ebb6e226f14d682e6f1ae1df 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: Fri, 21 May 2021 22:09:19 +0200 Subject: [PATCH] NoMan29's merge --- fetchy | Bin 21808 -> 25904 bytes fetchy.c | 55 ++++++++++++++++++++++++++++++++++++++++++------------- logos.h | 12 ++++++------ 3 files changed, 48 insertions(+), 19 deletions(-) diff --git a/fetchy b/fetchy index 8fe7f13c32851d37eb2e5834a2402d22ef369406..e706b8cfaba4af8c71d3fbd39971c32ecfbaa28a 100755 GIT binary patch literal 25904 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 delta 6983 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 R_RlYj8zUm6vvsp_{tM%0bg%#b diff --git a/fetchy.c b/fetchy.c index 1dd9b7a..2be7d10 100644 --- a/fetchy.c +++ b/fetchy.c @@ -16,7 +16,7 @@ void cache_info(char *cache_path, char **cpu_name, char **gpu); static int count_files(DIR *package_dir); -static char *get_sys(char *sys, char *os_name); +static char *get_sys(char *ascii, char *sys, char *os_name); static char *get_kernel(char *kern_name); static char *get_uptime(char *uptime); static char *get_RAM(char *ram_info); @@ -25,13 +25,13 @@ static char *get_gpu(char *gpu); static char *get_packages(char *package_count, char sys); -void concatenate_and_print(char sys, char *os, char *cpu_name, char *gpu); +void concatenate_and_print(char ascii, char sys, char *os, char *cpu_name, char *gpu); int main(int argc, char *argv[]){ - char sys, + char sys, ascii, *os_name = NULL, *cpu_name = NULL, *gpu = NULL, @@ -39,7 +39,7 @@ int main(int argc, char *argv[]){ *cache_path = malloc(BUF_SIZE * 2); cache_info(cache_path, &cpu_name, &gpu); - os = get_sys(&sys, os_name); + os = get_sys(&ascii, &sys, os_name); if ( argv[1] != NULL ){ @@ -51,8 +51,10 @@ int main(int argc, char *argv[]){ case 'u': case 'd': case 'm': + case 'o': + case 'v': - sys = *(argv[1] + 1) ; + ascii = *(argv[1] + 1) ; break; @@ -64,7 +66,7 @@ int main(int argc, char *argv[]){ //This one is in logos.h - concatenate_and_print(sys, os, cpu_name, gpu); + concatenate_and_print(ascii, sys, os, cpu_name, gpu); @@ -190,7 +192,7 @@ static int count_files(DIR *package_dir){ -static char *get_sys(char *sys, char *os_name){ +static char *get_sys(char *ascii, char *sys, char *os_name){ os_name = malloc(BUF_SIZE); char *name = malloc(BUF_SIZE); FILE *sysName = fopen("/etc/issue", "rt"); @@ -205,13 +207,40 @@ static char *get_sys(char *sys, char *os_name){ fclose(sysName); truncate_spaces_leading(name); - if ( !strcmp( name, "Artix") ) *sys = 'x'; - if ( !strcmp( name, "Arch") ) *sys = 'a'; - if ( !strcmp( name, "Manjaro") ) *sys = 'm'; - if ( !strcmp( name, "ArcoLinux") ) *sys = 'r'; + if ( !strcmp( name, "Artix") ) { + *sys = 'x'; + *ascii = 'x'; + } - if ( !strcmp( name, "Debian")) *sys = 'd'; - if ( !strcmp( name, "Ubuntu")) *sys = 'u'; + if ( !strcmp( name, "Arch") ) { + *sys = 'a'; + *ascii = 'a'; + } + + + if ( !strcmp( name, "Manjaro") ) { + *sys = 'm'; + *ascii = 'm'; + } + + + if ( !strcmp( name, "ArcoLinux") ) { + *sys = 'r'; + *ascii = 'r'; + } + + + + if ( !strcmp( name, "Debian")) { + *sys = 'd'; + *ascii = 'd'; + } + + + if ( !strcmp( name, "Ubuntu")) { + *sys = 'u'; + *ascii = 'u'; + } if( *sys == 'r' ) diff --git a/logos.h b/logos.h index f2c8332..3f81f01 100644 --- a/logos.h +++ b/logos.h @@ -1,4 +1,4 @@ -void concatenate_and_print(char sys, char *os, char *cpu_name, char *gpu){ +void concatenate_and_print(char ascii, char sys, char *os, char *cpu_name, char *gpu){ char *uptime = NULL, @@ -9,7 +9,7 @@ void concatenate_and_print(char sys, char *os, char *cpu_name, char *gpu){ - switch(sys){ + switch(ascii){ case 'a': @@ -108,8 +108,8 @@ void concatenate_and_print(char sys, char *os, char *cpu_name, char *gpu){ break; - case 'v': - rintf("\n"); + case 'v': + 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)); @@ -121,8 +121,8 @@ void concatenate_and_print(char sys, char *os, char *cpu_name, char *gpu){ break; - case 'o' - rintf("\n"); + case 'o': + 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));