diff --git a/fetchy b/fetchy index 8fe7f13..e706b8c 100755 Binary files a/fetchy and b/fetchy differ 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));