From 3707b7f5989dfb3914ce89d171f6e4d6f9198e9f Mon Sep 17 00:00:00 2001 From: Joe Todd <57013968+Joe-Todd0@users.noreply.github.com> Date: Sat, 6 Mar 2021 19:43:06 +0000 Subject: [PATCH] add package manager name Added the package manager name after the amount of packages installed. --- uwufetch.c | 71 ++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 53 insertions(+), 18 deletions(-) diff --git a/uwufetch.c b/uwufetch.c index 1474d36..47d6ba8 100644 --- a/uwufetch.c +++ b/uwufetch.c @@ -17,7 +17,7 @@ #define CYAN "\x1b[36m" #define WHITE "\x1b[37m" -char user[32], host[253], shell[64], version_name[64]; +char user[32], host[253], shell[64], version_name[64], pkgman_name[64]; int pkgman(); int main() { @@ -32,7 +32,7 @@ int main() { memmove(&shell[0], &shell[5], 16); // get os version - FILE *fos_rel = popen("cut -d '=' -f2 <<< $(cat /etc/lsb-release | grep ID)", "r"); + FILE *fos_rel = popen("cut -d '=' -f2 <<< $(cat /etc/os-release | grep ID=) 2> /dev/null", "r"); fscanf(fos_rel,"%[^\n]", version_name); fclose(fos_rel); @@ -52,25 +52,60 @@ int main() { int pkgs = pkgman(); // print collected info - if (strcmp(version_name, "Arch") == 0) { + 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 /\\ \\ %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%sPKGS %s%s%d %s\n", BLUE, NORMAL, BOLD, NORMAL, NORMAL, pkgs, pkgman_name); 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, "ManjaroLinux") == 0) { + 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 %s\n",BLUE, NORMAL, BOLD, NORMAL, NORMAL, pkgs, pkgman_name); + 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 %s\n", RED, NORMAL, BOLD, NORMAL, NORMAL, pkgs, pkgman_name); + 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 %s\n", CYAN, BLUE, NORMAL, BOLD, NORMAL, NORMAL, pkgs, pkgman_name); + 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 %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%sPKGS %s%s%d %s\n", BLUE, NORMAL, BOLD, NORMAL, NORMAL, pkgs, pkgman_name); 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); } @@ -98,15 +133,15 @@ int pkgman() { // this is just a function that returns the total of installed pa fscanf(file[6], "%d", &rpm); fscanf(file[7], "%d", &xbps); for (int i = 0; i < 8; i++) fclose(file[i]); + + if (apt > 0) { total += apt; snprintf(pkgman_name, 64, "(%s)", "apt"); } + if (dnf > 0) { total += dnf; snprintf(pkgman_name, 64, "(%s)", "dnf"); } + if (emerge > 0) { total += emerge; snprintf(pkgman_name, 64, "(%s)", "emerge"); } + if (flatpak > 0) { total += flatpak; snprintf(pkgman_name, 64, "(%s)", "flatpak"); } + if (nix > 0) { total += nix; snprintf(pkgman_name, 64, "(%s)", "nix"); } + if (pacman > 0) { total += pacman; snprintf(pkgman_name, 64, "(%s)", "pacman"); } + if (rpm > 0) { total += rpm; snprintf(pkgman_name, 64, "(%s)", "rpm"); } + if (xbps > 0) { total += xbps; snprintf(pkgman_name, 64, "(%s)", "xbps"); } - if (apt > 0) total += apt; - if (dnf > 0) total += dnf; - if (emerge > 0) total += emerge; - if (flatpak > 0) total += flatpak; - if (nix > 0) total += nix; - if (pacman > 0) total += pacman; - if (rpm > 0) total += rpm; - if (xbps > 0) total += xbps; - - return total; + return total; }