From 135a196f9a92473122d45dcef692bb4c8dab7520 Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 2 Nov 2023 18:00:45 +0300 Subject: [PATCH] fix --- Makefile | 3 ++ config.h | 1 + include/fetch.h | 1 + include/systems.h | 84 ----------------------------------------------- src/fetch.c | 9 +++++ src/main.c | 4 +-- 6 files changed, 16 insertions(+), 86 deletions(-) delete mode 100644 include/systems.h diff --git a/Makefile b/Makefile index f55fed7..a170b34 100644 --- a/Makefile +++ b/Makefile @@ -3,3 +3,6 @@ CC?=cc all: $(CC) src/*.c -Iinclude -I. $(CFLAGS) -okfetch + +clean: + rm kfetch diff --git a/config.h b/config.h index 926b8db..c44c562 100644 --- a/config.h +++ b/config.h @@ -14,6 +14,7 @@ typedef struct { static PARAMETR CONFIG[] = { {"Krnl ", GetKernel}, + {"User ", GetUser}, {"Os ", PrintOs}, {" ", Blank}, {" ", PrintColors} diff --git a/include/fetch.h b/include/fetch.h index 264e348..f5dbfa7 100644 --- a/include/fetch.h +++ b/include/fetch.h @@ -30,5 +30,6 @@ void GetKernel(const char *title, const FETCH fetch); void PrintOs(const char *title, const FETCH fetch); void PrintColors(const char *title, const FETCH fetch); void Blank(const char *title, const FETCH fetch); +void GetUser(const char *title, const FETCH fetch); #endif diff --git a/include/systems.h b/include/systems.h deleted file mode 100644 index 09c0c4f..0000000 --- a/include/systems.h +++ /dev/null @@ -1,84 +0,0 @@ -#ifndef _LOGOS_H -#define _LOGOS_H - -char *Debian[] = { - "\033[31m _____ ", - "\033[31m / __ \\ ", - "\033[31m| / | ", - "\033[31m| \\___` ", - "\033[31m -_ ", - "\033[31m --_ ", - " " -}; - -char *Void[] = { - "\033[32m _\033[36m________ ", - "\033[32m / \\\033[36m\\ _ \\ ", - "\033[32m| /\\\033[36m\\ \\ | ", - "\033[32m| ( (\033[36m_) ) | ", - "\033[32m| \\_ \\\033[36m\\/ | ", - "\033[32m \\______\\\033[36m\\_/ ", - " " -}; - -char *Alpine[] = { - "\033[34m /\\ /\\ ", - "\033[34m / \\ \\ ", - "\033[34m / \\ \\ ", - "\033[34m / \\ \\ ", - "\033[34m/ \\ \\ ", - "\033[34m \\ ", - " " -}; - -char *Arch[] = { - "\033[1;34m /\\ ", - "\033[1;34m / \\ ", - "\033[1;34m /\\ \\ ", - "\033[1;34m / \\ ", - "\033[1;34m / ,, \\ ", - "\033[1;34m / | | -\\ ", - "\033[1;34m/_-'' ''-_\\", - " " -}; - -char *Android[] = { - "\033[32m ;, ,; ", - "\033[32m ';,.-----.,;' ", - "\033[32m ,' ', ", - "\033[32m / O O \\ ", - "\033[32m| | ", - "\033[32m'-----------------' ", - " ", -}; - -char *OpenBSD[] = { - "\033[1;33m _____ ", - "\033[1;33m \\- -/ ", - "\033[1;33m \\_/ \\ ", - "\033[1;33m \\ \033[0mO O\033[1;33m | ", - "\033[1;33m |_ < ) 3 ) ", - "\033[1;33m / \\ / ", - "\033[1;33m /-_____-\\ ", - " " -}; - -char *PlainOs[] = { - " /U /U ", - "( . .) ", - "*(()()) ", - " " -}; - -char *Unknow[] = { - "\033[1;36m ___ ", - "\033[1;36m (\033[0m..\033[1;36m | ", - "\033[1;36m (\033[33m<> \033[1;36m| ", - "\033[1;36m / \033[0m__\033[1;36m \\ ", - "\033[1;36m ( \033[0m/ \\\033[1;36m /| ", - "\033[33m_\033[1;36m/ \033[0m\\__/\033[1;36m/_) ", - "\033[1;36m\\/\033[1;36m-____\033[33m\\/ ", - " " -}; - -#endif diff --git a/src/fetch.c b/src/fetch.c index ad8cfd2..621a1a5 100644 --- a/src/fetch.c +++ b/src/fetch.c @@ -1,7 +1,9 @@ +#include #include #include #include #include +#include #include #include "fetch.h" #include "config.h" @@ -74,3 +76,10 @@ void Blank(const char *title, const FETCH fetch) { printf(""); } + +void GetUser(const char *title, const FETCH fetch) { + UNUSED(fetch); + + struct passwd *pw = getpwuid(geteuid()); + printf("%s%s%s%s", fetch.color, title, fetch.font_color, (pw != 0) ? pw->pw_name : "none"); +} diff --git a/src/main.c b/src/main.c index 4430e30..a65f880 100644 --- a/src/main.c +++ b/src/main.c @@ -13,12 +13,12 @@ int main(void) { printf("%s", fetch.logo[fetch.logo_size - 1]); CONFIG[i].func(CONFIG[i].title, fetch); - putchar('\n'); + printf("\033[0m\n"); } for (; i < fetch.logo_size; i++) printf("%s\n", fetch.logo[i]); - printf("\n\033[0m"); + printf("\033[0m\n"); return 0; }