Загрузить файлы в «»

funcs.h

@@ -16,7 +16,6 @@
 	#define CLOCK CLOCK_MONOTONIC
 #endif
 
-//Varables
 typedef struct {
 	size_t size;
 	char *color;
@@ -53,7 +52,6 @@ void Init(void) {
 	}
 }
 
-
 void GetShell(void) {
 	char *shell = getenv("SHELL");
 	if (shell == NULL) {
@@ -66,7 +64,6 @@ void GetShell(void) {
 		printf("%s  SHELL  \033[0;37m%s\033[0m", Logo.color, splt + 1);
 }
 
-
 void GetKernel(void) {
 	printf("%s KERNEL  \033[0;37m%s\033[0m", Logo.color, Uts.release);
 }
@@ -74,14 +71,13 @@ void GetKernel(void) {
 
 void PrintOs(void) {
 	if (Os == NULL) {
-		printf("%s     OS  \033[0;37m%s\033[0m", Logo.color, Uts.sysname);
+		printf("%s      OS  \033[0;37m%s\033[0m", Logo.color, Uts.sysname);
 		return;
 	}
 
 	printf("%s     OS  \033[0;37m%s\033[0m", Logo.color, Os + strlen("PRETTY_NAME= "));
 }
 
-
 void GetUptime(void) {
 	#ifdef CLOCK
 		struct timespec uptime;
@@ -98,13 +94,11 @@ void GetUptime(void) {
 	#endif
 }
 
-
 void GetUser(void) {
 	struct passwd *pw = getpwuid(geteuid());
 	printf("%s   USER  \033[0;37m%s\033[0m", Logo.color, pw->pw_name);
 }
 
-
 void GetPkgs(void) {
 	if (Logo.pkg_cmd == NULL) {
 		printf("%s   PKGS  \033[0;37m0", Logo.color);
@@ -121,7 +115,6 @@ void GetPkgs(void) {
 	pclose(fp);
 }
 
-
 char *GetOs(void) {
 	FILE *fp = fopen("/etc/os-release", "r");
 	if (fp == NULL)
@@ -140,60 +133,68 @@ char *GetOs(void) {
 				return line;
 			}
 		}
+
+		//EOF
+		free(line);
 	}
 
 	return NULL;
 }
 
-
 void PrintColors(void) {
-	printf("   ");
+	printf("  ");
 	for (int i = 0; i < 7; i++)
 		printf("\033[1;3%dm● \033[0;3%dm● \033[0m", i, i);
 }
 
-
 void GetArch(void) {
 	printf("%s   ARCH  \033[0;37m%s", Logo.color, Uts.machine);
 }
 
-
 void Blank(void) {
 	return;
 }
 
-
 LOGO GetArt(void) {
 	LOGO art;
 
-	//Else
+	if (Os != NULL) {
-	art.size = sizeof(Unknow) / sizeof(char *);
+		if (strstr(Os, "Debian")) {
-	art.pkg_cmd = NULL;
+			art.size = sizeof(Debian) / sizeof(char *);
-	art.art = Unknow;
+			art.pkg_cmd = "dpkg -l | tail -n+6 | wc -l";
-	art.color = "\033[1;35m";
+			art.art = Debian;
-	if (Os == NULL)
+			art.color = "\033[0;31m";
-		return art;
+		}
 
-	else if (strstr(Os, "Debian")) {
+		else if (strstr(Os, "Void")) {
-		art.size = sizeof(Debian) / sizeof(char *);
+			art.size = sizeof(Void) / sizeof(char *);
-		art.pkg_cmd = "dpkg -l | tail -n+6 | wc -l";
+			art.pkg_cmd = "xbps-query -l | wc -l";
-		art.art = Debian;
+			art.art = Void;
-		art.color = "\033[0;31m";
+			art.color = "\033[0;32m";
+		}
+
+		else if (strstr(Os, "Alpine")) {
+			art.size = sizeof(Alpine) / sizeof(char *);
+			art.pkg_cmd = "grep 'P:' /lib/apk/db/installed | wc -l";
+			art.art = Alpine;
+			art.color = "\033[1;34m";
+		}
+
+		else if (strstr(Os, "Arch") || strstr(Os, "Artix")) {
+			art.size = sizeof(Arch) / sizeof(char *);
+			art.pkg_cmd = "pacman -Qq | wc -l";
+	                art.art = Arch;
+        	        art.color = "\033[0;34m";
+	        }
 	}
 
-	else if (strstr(Os, "Void")) {
+	else {
-		art.size = sizeof(Void) / sizeof(char *);
+		art.size = sizeof(Unknow) / sizeof(char *);
-		art.pkg_cmd = "xbps-query -l | wc -l";
+		art.pkg_cmd = NULL;
-		art.art = Void;
+		art.art = Unknow;
-		art.color = "\033[0;32m";
+		art.color = "\033[1;36m";
-	}
-
-	else if (strstr(Os, "Alpine")) {
-		art.size = sizeof(Alpine) / sizeof(char *);
-		art.pkg_cmd = "grep 'P:' /lib/apk/db/installed | wc -l";
-		art.art = Alpine;
-		art.color = "\033[1;34m";
 	}
 
 	return art;
 }
+

logos.h

@@ -25,10 +25,22 @@ char *Alpine[] = {
 	"\033[34m /      \\  \\  ",
 	"\033[34m/        \\  \\ ",
 	"\033[34m          \\   ",
-	"             "
+	"              "
+};
+
+char *Arch[] = {
+	"\033[1;34m      /\\      ",
+	"\033[1;34m     /  \\     ",
+	"\033[1;34m    /\\   \\    ",
+	"\033[1;34m   /      \\   ",
+	"\033[1;34m  /   ,,   \\  ",
+	"\033[1;34m /   |  |  -\\ ",
+	"\033[1;34m/_-''    ''-_\\",
+	"              "
 };
 
 char *Unknow[] = {
+	"             ",
 	"\033[35m    ___       ",
 	"\033[35m   (\033[0m..\033[35m |      ",
 	"\033[35m   (\033[33m<> \033[35m|      ",