From 9225aec8fa5f6f90fbfb49f3affb0af27536f486 Mon Sep 17 00:00:00 2001 From: dqnk <64268180+dqnk@users.noreply.github.com> Date: Sat, 18 Dec 2021 21:38:58 +0100 Subject: [PATCH 1/2] fixed issue with host model version being printed instead of the model name --- uwufetch.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/uwufetch.c b/uwufetch.c index 2b8d42d..893a880 100644 --- a/uwufetch.c +++ b/uwufetch.c @@ -102,7 +102,7 @@ struct configuration { char* terminal_cursor_move = "\033[18C"; struct info { - char user[128], host[256], shell[64], host_model[256], kernel[256], + char user[128], host[256], shell[64], host_model[256], host_model_version[256], kernel[256], version_name[64], cpu_model[256], gpu_model[64][256], pkgman_name[64], image_name[128], *config_directory, *cache_content; int target_width, screen_width, screen_height, ram_total, ram_used, pkgs; @@ -310,8 +310,10 @@ int pkgman(struct info* user_info) { // this is just a function that returns the total of installed packages int total = 0; -#ifndef __APPLE__ // this function is not used on mac os because it causes lots \ - // of problems +#ifndef __APPLE__ + // this function is not used on mac os because it causes lots of + // problems + #ifndef _WIN32 struct package_manager pkgmans[] = { {"apt list --installed 2> /dev/null | wc -l", "(apt)"}, @@ -755,15 +757,15 @@ struct info get_info() sprintf(user_info.version_name, "amogos"); } } - if (host_model_info) { - while (fgets(line, sizeof(line), host_model_info)) - if (sscanf(line, "%[^\n]", user_info.host_model)) break; + if (host_model_version) { + while (fgets(line, sizeof(line), host_model_version)) + if (sscanf(line, "%[^\n]", user_info.host_model_version)) break; if (host_model_version) { char version[32]; while (fgets(line, sizeof(line), host_model_version)) { if (sscanf(line, "%[^\n]", version)) { - strcat(user_info.host_model, " "); - strcat(user_info.host_model, version); + strcat(user_info.host_model_version, " "); + strcat(user_info.host_model_version, version); break; } } From 20fff2ccdf4be55b8ad453749506fb585ca79c98 Mon Sep 17 00:00:00 2001 From: dqnk <64268180+dqnk@users.noreply.github.com> Date: Sat, 18 Dec 2021 21:39:27 +0100 Subject: [PATCH 2/2] no reason to use amogos flag when testing --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 838f3ab..2e3cd14 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ build: $(FILES) debug: $(CC) $(CFLAGS_DEBUG) -o $(NAME) $(FILES) - ./$(NAME) -d amogos + ./$(NAME) install: mkdir -p $(DESTDIR)$(PREFIX) $(DESTDIR)$(LIBDIR)/uwufetch $(DESTDIR)$(MANDIR)