exhq/neowofetch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #174 from dqnk/main

Browse source 
[FIX] Motherboard/model name being overwritten
This commit is contained in:
TheDarkBug 2021-12-18 23:09:30 +01:00 committed by GitHub
commit b68f8b2ff4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -30,7 +30,7 @@ build: $(FILES)
debug: debug:
$(CC) $(CFLAGS_DEBUG) -o $(NAME) $(FILES) $(CC) $(CFLAGS_DEBUG) -o $(NAME) $(FILES)
./$(NAME) -d amogos ./$(NAME)
install: install:
mkdir -p $(DESTDIR)$(PREFIX) $(DESTDIR)$(LIBDIR)/uwufetch $(DESTDIR)$(MANDIR) mkdir -p $(DESTDIR)$(PREFIX) $(DESTDIR)$(LIBDIR)/uwufetch $(DESTDIR)$(MANDIR)

18
uwufetch.c
View file

@ -102,7 +102,7 @@ struct configuration {
char* terminal_cursor_move = "\033[18C"; char* terminal_cursor_move = "\033[18C";
struct info { 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], version_name[64], cpu_model[256], gpu_model[64][256], pkgman_name[64],
image_name[128], *config_directory, *cache_content; image_name[128], *config_directory, *cache_content;
int target_width, screen_width, screen_height, ram_total, ram_used, pkgs; 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 { // this is just a function that returns the total of installed packages
int total = 0; int total = 0;
#ifndef __APPLE__ // this function is not used on mac os because it causes lots \ #ifndef __APPLE__
// of problems // this function is not used on mac os because it causes lots of
// problems
#ifndef _WIN32 #ifndef _WIN32
struct package_manager pkgmans[] = { struct package_manager pkgmans[] = {
{"apt list --installed 2> /dev/null | wc -l", "(apt)"}, {"apt list --installed 2> /dev/null | wc -l", "(apt)"},
@ -755,15 +757,15 @@ struct info get_info()
sprintf(user_info.version_name, "amogos"); sprintf(user_info.version_name, "amogos");
} }
} }
if (host_model_info) { if (host_model_version) {
while (fgets(line, sizeof(line), host_model_info)) while (fgets(line, sizeof(line), host_model_version))
if (sscanf(line, "%[^\n]", user_info.host_model)) break; if (sscanf(line, "%[^\n]", user_info.host_model_version)) break;
if (host_model_version) { if (host_model_version) {
char version[32]; char version[32];
while (fgets(line, sizeof(line), host_model_version)) { while (fgets(line, sizeof(line), host_model_version)) {
if (sscanf(line, "%[^\n]", 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; break;
} }
} }