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

Fixed strange error caused by a merge in uwufetch.c

Browse source
This commit is contained in:
TheDarkBug 2021-03-06 21:24:04 +01:00
parent b3c0b0592b
commit 5bff492166
1 changed files with 0 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
uwufetch.c
View file

@ -32,74 +32,12 @@ void print_image();
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
<<<<<<< HEAD
get_info(); get_info();
//sprintf(version_name, "%s", "manjaro"); // a debug thing //sprintf(version_name, "%s", "manjaro"); // a debug thing
//char c = getopt(argc, argv, "adhi"); // things for the future //char c = getopt(argc, argv, "adhi"); // things for the future
print_ascii(); print_ascii();
//system("viu -t -w 18 -h 8 $HOME/.config/uwufetch/arch.png"); // other things for the future //system("viu -t -w 18 -h 8 $HOME/.config/uwufetch/arch.png"); // other things for the future
print_info(user, host, version_name, sys_var.release, sys_var.machine, cpu_model, &r_usage.ru_maxrss, &ram_max, shell, &sys.uptime); print_info(user, host, version_name, sys_var.release, sys_var.machine, cpu_model, &r_usage.ru_maxrss, &ram_max, shell, &sys.uptime);
=======
int pkgs = pkgman();
// print collected info
if (strcmp(version_name, "arch") == 0) {
printf("%s %s@%s\n", BOLD, user, host);
printf("%s /\\ %s%sOWOS %sNyArch Linuwu\n", BLUE, NORMAL, BOLD, NORMAL);
printf("%s / \\ %s%sKERNEL %s%s %s\n", BLUE, NORMAL, BOLD, NORMAL, sys_var.release, sys_var.machine);
printf("%s /\\ \\ %s%sCPUWU %s%s\n", BLUE, NORMAL, BOLD, NORMAL, cpu_model);
printf("%s / > w <\\ %s%sWAM %s%ldM/%iM\n", BLUE, NORMAL, BOLD, NORMAL, r_usage.ru_maxrss, ram_max);
printf("%s / __ \\ %s%sSHELL %s%s\n", BLUE, NORMAL, BOLD, NORMAL, shell);
printf("%s / __| |__-\\ %s%sPKGS %s%s%d\n", BLUE, NORMAL, BOLD, NORMAL, NORMAL, pkgs);
printf("%s /_-'' ''-_\\ %s%sUWUPTIME %s%lid, %lih, %lim\n", BLUE, NORMAL, BOLD, NORMAL, sys.uptime/60/60/24, sys.uptime/60/60%24, sys.uptime/60%60);
printf(" %s%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\n", BOLD, BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE, NORMAL);
}
else if (strcmp(version_name, "artix") == 0) {
printf("%s %s@%s\n", BOLD, user, host);
printf("%s /\\ %s%sOS %sNyArtix Linuwu\n", BLUE, NORMAL, BOLD, NORMAL);
printf("%s / \\ %s%sKERNEL %s%s %s\n", BLUE, NORMAL, BOLD, NORMAL, sys_var.release, sys_var.machine);
printf("%s /`'.,\\ %s%sCPUWU %s%s\n", BLUE, NORMAL, BOLD, NORMAL, cpu_model);
printf("%s /\u2022 w \u2022 \\ %s%sWAM %s%ldM/%iM\n", BLUE, NORMAL, BOLD, NORMAL, r_usage.ru_maxrss, ram_max);
printf("%s / ,`\\ %s%sSHELL %s%s\n", BLUE, NORMAL, BOLD, NORMAL, shell);
printf("%s / ,.'`. \\ %s%sPKGS %s%s%d\n", BLUE, NORMAL, BOLD, NORMAL, NORMAL, pkgs);
printf("%s /.,'` `'.\\ %s%sUWUPTIME %s%lid, %lih, %lim\n", BLUE, NORMAL, BOLD, NORMAL, sys.uptime/60/60/24, sys.uptime/60/60%24, sys.uptime/60%60);
printf(" %s%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\n", BOLD, BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE, NORMAL);
}
else if (strcmp(version_name, "debian") == 0) {
printf("%s %s@%s\n", BOLD, user, host);
printf("%s _____ %s%sOWOS %sdebiNyan gnUwU/linuwu\n", RED, NORMAL, BOLD, NORMAL);
printf("%s / ___ \\ %s%sKERNEL %s%s %s\n", RED, NORMAL, BOLD, NORMAL, sys_var.release, sys_var.machine);
printf("%s | / OwO | %s%sCPUWU %s%s\n", RED, NORMAL, BOLD, NORMAL, cpu_model);
printf("%s | \\____- %s%sWAM %s%ldM/%iM\n", RED, NORMAL, BOLD, NORMAL, r_usage.ru_maxrss, ram_max);
printf("%s -_ %s%sSHELL %s%s\n", RED, NORMAL, BOLD, NORMAL, shell);
printf("%s --_ %s%sPKGS %s%s%d\n", RED, NORMAL, BOLD, NORMAL, NORMAL, pkgs);
printf("%s %s%sUWUPTIME %s%lid, %lih, %lim\n", RED, NORMAL, BOLD, NORMAL, sys.uptime/60/60/24, sys.uptime/60/60%24, sys.uptime/60%60);
printf(" %s%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\n", BOLD, BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE, NORMAL);
}
else if (strcmp(version_name, "fedora") == 0) {
printf("%s _____%s%s %s@%s\n", BLUE, NORMAL, BOLD, user, host);
printf("%s / __)%s\\ %s%sOS %sFedowa\n", BLUE, CYAN, NORMAL, BOLD, NORMAL);
printf("%s > %s| / %s<%s\\ \\ %s%sKERNEL %s%s %s\n", WHITE, BLUE, WHITE, CYAN, NORMAL, BOLD, NORMAL, sys_var.release, sys_var.machine);
printf("%s __%s_| %sw%s|_%s_/ / %s%sCPUWU %s%s\n", CYAN, BLUE, WHITE, BLUE, CYAN, NORMAL, BOLD, NORMAL, cpu_model);
printf("%s / %s(_ _)%s_/ %s%sWAM %s%ldM/%iM\n", CYAN, BLUE, CYAN, NORMAL, BOLD, NORMAL, r_usage.ru_maxrss, ram_max);
printf("%s / / %s| | %s%sSHELL %s%s\n", CYAN, BLUE, NORMAL, BOLD, NORMAL, shell);
printf("%s \\ \\%s__/ | %s%sPKGS %s%s%d\n", CYAN, BLUE, NORMAL, BOLD, NORMAL, NORMAL, pkgs);
printf("%s \\%s(_____/ %s%sUWUPTIME %s%lid, %lih, %lim\n", CYAN, BLUE, NORMAL, BOLD, NORMAL, sys.uptime/60/60/24, sys.uptime/60/60%24, sys.uptime/60%60);
printf(" %s%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\n", BOLD, BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE, NORMAL);
}
else if (strcmp(version_name, "manjaro") == 0) {
printf("%s \u25b3 \u25b3 \u25e0\u25e0\u25e0\u25e0 %s@%s\n", BOLD, user, host);
printf("%s \e[0;42m \e[0m \e[0;42m \e[0m %s%sOWOS %sMyanjaro Linuwu\n", BLUE, NORMAL, BOLD, NORMAL);
printf("%s \e[0;42m \e[0m\e[0;42m\e[1;30m > w < \e[0m%s\e[0;42m \e[0m \e[0;42m \e[0m %s%sKERNEL %s%s %s\n", BLUE, BLUE, NORMAL, BOLD, NORMAL, sys_var.release, sys_var.machine);
printf("%s \e[0;42m \e[0m \e[0;42m \e[0m %s%sCPUWU %s%s\n", BLUE, NORMAL, BOLD, NORMAL, cpu_model);
printf("%s \e[0;42m \e[0m \e[0;42m \e[0m \e[0;42m \e[0m %s%sWAM %s%ldM/%iM\n", BLUE, NORMAL, BOLD, NORMAL, r_usage.ru_maxrss, ram_max);
printf("%s \e[0;42m \e[0m \e[0;42m \e[0m \e[0;42m \e[0m %s%sSHELL %s%s\n", BLUE, NORMAL, BOLD, NORMAL, shell);
printf("%s \e[0;42m \e[0m \e[0;42m \e[0m \e[0;42m \e[0m %s%sPKGS %s%s%d\n", BLUE, NORMAL, BOLD, NORMAL, NORMAL, pkgs);
printf("%s \e[0;42m \e[0m \e[0;42m \e[0m \e[0;42m \e[0m %s%sUWUPTIME %s%lid, %lih, %lim\n", BLUE, NORMAL, BOLD, NORMAL, sys.uptime/60/60/24, sys.uptime/60/60%24, sys.uptime/60%60);
printf(" %s%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\n", BOLD, BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE, NORMAL);
}
>>>>>>> 5dc6ed7b5b3c1db633d882107c4d322d1e8af73d
} }
int pkgman() { // this is just a function that returns the total of installed packages int pkgman() { // this is just a function that returns the total of installed packages