From f546dfbd9118f441dbb7466892d6bf2ffb19bb64 Mon Sep 17 00:00:00 2001 From: TheDarkBug Date: Fri, 5 Mar 2021 17:22:48 +0100 Subject: [PATCH] Now you can uwu on Myanjaro, fixed wrong ram usage and changed version_name --- Makefile | 6 ++- README.md | 5 +-- main.c | 107 -------------------------------------------------- uwufetch.c | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 117 insertions(+), 113 deletions(-) delete mode 100644 main.c create mode 100644 uwufetch.c diff --git a/Makefile b/Makefile index 53297e3..6f4ea61 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,12 @@ NAME = uwufetch -FILES = main.c +FILES = uwufetch.c FLAGS = -O3 -Wall -Wextra INSTALL_DIR = /usr/bin/ all: build install + clear + uwufetch -build: main.c +build: uwufetch.c gcc $(FLAGS) -o $(NAME) $(FILES) install: diff --git a/README.md b/README.md index febc8d9..dcab3da 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ A meme system info tool for Linux, based on nyan/UwU trend on r/linuxmasterrace. ## Currently supported distros -Arch Linux. +NyArch Linuwu, Myanjaro Linuwu ## Building and installation @@ -24,7 +24,4 @@ make uninstall ``` ## License - This program is provided under the [GPL-3.0 License](https://github.com/TheDarkBug/uwufetch/LICENSE). - -# diff --git a/main.c b/main.c deleted file mode 100644 index a93692c..0000000 --- a/main.c +++ /dev/null @@ -1,107 +0,0 @@ -#include -#include -#include -#include -#include -#include -// COLORS -#define NORMAL "\x1b[0m" -#define BOLD "\x1b[1m" -#define BLACK "\x1b[30m" -#define RED "\x1b[31m" -#define GREEN "\x1b[32m" -#define YELLOW "\x1b[33m" -#define BLUE "\x1b[34m" -#define MAGENTA "\x1b[35m" -#define CYAN "\x1b[36m" -#define WHITE "\x1b[37m" - -char user[32], host[253], shell[64], version_name[64]; -int pkgman(); - -int main() { - - // get user name, host name and shell - struct utsname sys_var; - struct sysinfo sys; - - snprintf(user, 32, "%s", getenv("USER")); - gethostname(host, 253); - snprintf(shell, 16, "%s", getenv("SHELL")); - memmove(&shell[0], &shell[5], 16); - - // get os version - FILE *fos_rel = popen("lsb_release -a | grep Description", "r"); - fscanf(fos_rel,"%[^\n]", version_name); - fclose(fos_rel); - memmove(&version_name[0], &version_name[12], 32); - - if (uname(&sys_var) == -1) printf("Ah sh*t, an error\n"); - if (sysinfo(&sys) == -1) printf("Ah sh*t, an error\n"); - - // get cpu info - char cpu_model[256]; - FILE *fcpu = popen("lscpu | grep 'Model name:'", "r"); - fscanf(fcpu, "%[^\n]", cpu_model); - fclose(fcpu); - memmove(&cpu_model[0], &cpu_model[33], 128); - - // get ram info - int ram_max = sys.totalram * sys.mem_unit / 1048576; - int ram_used; - FILE *framu = popen("grep -i MemAvailable /proc/meminfo | awk '{print $2}' ", "r"); - fscanf(framu, "%i", &ram_used); - fclose(framu); - ram_used = ram_used / 1024; - - // print collected info - if (strcmp(version_name, "Arch Linux")) { - printf("%s %s@%s\n", BOLD, user, host); - printf("%s /\\ %s%sOS %s%s\n", BLUE, NORMAL, BOLD, NORMAL, version_name); - printf("%s / \\ %s%sKERNEL %s%s %s\n", BLUE, NORMAL, BOLD, NORMAL, sys_var.release, sys_var.machine); - printf("%s /\\ \\ %s%sCPU %s%s\n", BLUE, NORMAL, BOLD, NORMAL, cpu_model); - printf("%s / ~owo~\\ %s%sRAM %s%iM/%iM\n", BLUE, NORMAL, BOLD, NORMAL, ram_used, 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, pkgman()); - printf("%s /_-'' ''-_\\ %s%sUPTIME %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); - } -} - -int pkgman() { // this is just a function that returns the total of installed packages - int apt, dnf, emerge, flatpak, nix, pacman, rpm, snap, xbps, total = 0; - - FILE *file[9]; - file[0] = popen("dpkg-query -f '${binary:Package}\n' -W 2> /dev/null | wc -l", "r"); - file[1] = popen("dnf list installed 2> /dev/null | wc -l", "r"); - file[2] = popen("qlist -I 2> /dev/null | wc -l", "r"); - file[3] = popen("flatpak list 2> /dev/null | wc -l", "r"); - file[4] = popen("nix-store -q --requisites /run/current-sys_vartem/sw 2> /dev/null | wc -l", "r"); - file[5] = popen("pacman -Qq 2> /dev/null | wc -l", "r"); - file[6] = popen("rpm -qa --last 2> /dev/null | wc -l", "r"); - file[7] = popen("snap list 2> /dev/null | wc -l", "r"); - file[8] = popen("xbps-query -l 2> /dev/null | wc -l", "r"); - - fscanf(file[0], "%d", &apt); - fscanf(file[1], "%d", &dnf); - fscanf(file[2], "%d", &emerge); - fscanf(file[3], "%d", &flatpak); - fscanf(file[4], "%d", &nix); - fscanf(file[5], "%d", &pacman); - fscanf(file[6], "%d", &rpm); - fscanf(file[7], "%d", &snap); - fscanf(file[8], "%d", &xbps); - for (int i = 0; i < 9; i++) fclose(file[i]); - - 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 (snap > 0) total += snap; - if (xbps > 0) total += xbps; - - return total; -} diff --git a/uwufetch.c b/uwufetch.c new file mode 100644 index 0000000..d997a2d --- /dev/null +++ b/uwufetch.c @@ -0,0 +1,112 @@ +#include +#include +#include +#include +#include +#include +#include +// COLORS +#define NORMAL "\x1b[0m" +#define BOLD "\x1b[1m" +#define BLACK "\x1b[30m" +#define RED "\x1b[31m" +#define GREEN "\x1b[32m" +#define YELLOW "\x1b[33m" +#define BLUE "\x1b[34m" +#define MAGENTA "\x1b[35m" +#define CYAN "\x1b[36m" +#define WHITE "\x1b[37m" + +char user[32], host[253], shell[64], version_name[64]; +int pkgman(); + +int main() { + + struct rusage r_usage; + struct utsname sys_var; + struct sysinfo sys; + // get user name, host name and shell + snprintf(user, 32, "%s", getenv("USER")); + gethostname(host, 253); + snprintf(shell, 16, "%s", getenv("SHELL")); + memmove(&shell[0], &shell[5], 16); + + // get os version + FILE *fos_rel = popen("cut -d '=' -f2 <<< $(cat /etc/lsb-release | grep ID)", "r"); + fscanf(fos_rel,"%[^\n]", version_name); + fclose(fos_rel); + + if (uname(&sys_var) == -1) printf("Ah sh*t, an error\n"); + if (sysinfo(&sys) == -1) printf("Ah sh*t, an error\n"); + + // get cpu info + char cpu_model[256]; + FILE *fcpu = popen("lscpu | grep 'Model name:'", "r"); + fscanf(fcpu, "%[^\n]", cpu_model); + fclose(fcpu); + memmove(&cpu_model[0], &cpu_model[33], 128); + + // get ram info + int ram_max = sys.totalram * sys.mem_unit / 1048576; + getrusage(RUSAGE_SELF,&r_usage); + + 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%sRAM %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, "ManjaroLinux") == 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%sRAM %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); + } +} + +int pkgman() { // this is just a function that returns the total of installed packages + int apt, dnf, emerge, flatpak, nix, pacman, rpm, xbps, total = 0; + + FILE *file[8]; + file[0] = popen("dpkg-query -f '${binary:Package}\n' -W 2> /dev/null | wc -l", "r"); + file[1] = popen("dnf list installed 2> /dev/null | wc -l", "r"); + file[2] = popen("qlist -I 2> /dev/null | wc -l", "r"); + file[3] = popen("flatpak list 2> /dev/null | wc -l", "r"); + file[4] = popen("nix-store -q --requisites /run/current-sys_vartem/sw 2> /dev/null | wc -l", "r"); + file[5] = popen("pacman -Qq 2> /dev/null | wc -l", "r"); + file[6] = popen("rpm -qa --last 2> /dev/null | wc -l", "r"); + file[7] = popen("xbps-query -l 2> /dev/null | wc -l", "r"); + + fscanf(file[0], "%d", &apt); + fscanf(file[1], "%d", &dnf); + fscanf(file[2], "%d", &emerge); + fscanf(file[3], "%d", &flatpak); + fscanf(file[4], "%d", &nix); + fscanf(file[5], "%d", &pacman); + 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; + 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; +}