From aec252977e26a59174298b1dfc9ff75e861594a5 Mon Sep 17 00:00:00 2001
From: rafa_99 <rafa99@protonmail.com>
Date: Wed, 23 Sep 2020 15:22:35 +0100
Subject: Updated Some Var names and added Logo

---
 Makefile  |   6 +-
 actions.c | 240 --------------------------------------------------------------
 actions.h |  10 ---
 flags.c   | 240 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 flags.h   |  10 +++
 logo.png  | Bin 0 -> 37120 bytes
 pkg.c     |  12 +---
 7 files changed, 255 insertions(+), 263 deletions(-)
 delete mode 100644 actions.c
 delete mode 100644 actions.h
 create mode 100644 flags.c
 create mode 100644 flags.h
 create mode 100644 logo.png

diff --git a/Makefile b/Makefile
index c018ad1..f0c653e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,5 @@
-all: pkg
-
-pkg:
-	cc -o pkg pkg.c actions.c utils.c
+all:
+	cc -o pkg pkg.c flags.c utils.c
 
 clean:
 	rm -rf pkg
diff --git a/actions.c b/actions.c
deleted file mode 100644
index 3753a35..0000000
--- a/actions.c
+++ /dev/null
@@ -1,240 +0,0 @@
-#include <stdlib.h>
-#include <string.h>
-#include "actions.h"
-
-void actions(char action, char* packages)
-{
-	int os = detectOsType();
-	switch (action)
-	{
-		case 'c':
-			cleanPackages(os);
-			break;
-
-		case 'h':
-			help();
-			break;
-
-		case 'i':
-			installPackages(os, packages);
-			break;
-
-		case 'q':
-			queryPackages(os);
-			break;
-
-		case 'r':
-			removePackages(os, packages);
-			break;
-
-		case 's':
-			searchPackages(os, packages);
-			break;
-
-		case 'u':
-			updatePackages(os);
-			break;
-
-		default:
-			puts("Command not found");
-			help();
-	}
-}
-
-void cleanPackages(int os)
-{
-	switch(os)
-	{
-		case pacman:
-			system("pacman -Rns \"$(pacman -Qtdq)\" || pacman -Scc");
-			break;
-
-		case apt:
-			system("apt autoremove --purge || apt clean");
-			break;
-
-		case emerge:
-			system("emerge -caq");
-			break;
-
-		case xbps:
-			system("xbps-remove -ROo");
-	}
-}
-
-void help()
-{
-	printf("PKG Options:\n"
-			"c - removes orphans and cleans the package cache\n"
-			"h - display this message\n"
-			"i - installs selected packages\n"
-			"q - display installed packages\n"
-			"r - remove a selected package\n"
-			"s - look up for a package in the available repositories\n"
-			"u - updates repos and packages\n\n");
-}
-
-void installPackages(int os, char *packages)
-{
-	if ( strlen(packages) > 0 )
-	{
-		char* command = (char *) calloc(strlen(packages) + 80, sizeof(char));
-		switch(os)
-		{
-			case pacman:
-				strcpy(command, "pacman -S ");
-				strcat(command, packages);
-				system(command);
-				free(command);
-				break;
-
-			case apt:
-				strcpy(command, "apt install ");
-				strcat(command, packages);
-				system(command);
-				free(command);
-				break;
-
-			case emerge:
-				strcpy(command, "emerge -aq ");
-				strcat(command, packages);
-				system(command);
-				free(command);
-				break;
-
-			case xbps:
-				strcpy(command, "xbps-install -S ");
-				strcat(command, packages);
-				system(command);
-				free(command);
-				break;
-
-			default:
-				free(command);
-		}
-	}
-}
-
-void queryPackages(int os)
-{
-	switch(os)
-	{
-		case pacman:
-			system("pacman -Qs");
-			break;
-
-		case apt:
-			system("apt list --installed");
-			break;
-
-		case emerge:
-			system("cd /var/db/pkg/ && ls -d */* | sed 's:\\/$::'");
-			break;
-
-		case xbps:
-			system("xbps-query -l");
-	}
-}
-
-void removePackages(int os, char *packages)
-{
-	if ( strlen(packages) > 0 )
-	{
-		char* command = (char *) calloc(strlen(packages) + 80, sizeof(char));
-		switch(os)
-		{
-			case pacman:
-				strcpy(command, "pacman -Rnsc ");
-				strcat(command, packages);
-				system(command);
-				free(command);
-				break;
-
-			case apt:
-				strcpy(command, "apt autoremove --purge ");
-				strcat(command, packages);
-				system(command);
-				free(command);
-				break;
-
-			case emerge:
-				strcpy(command, "emerge -caq ");
-				strcat(command, packages);
-				system(command);
-				free(command);
-				break;
-
-			case xbps:
-				strcpy(command, "xbps-remove -ROo ");
-				strcat(command, packages);
-				system(command);
-				free(command);
-				break;
-
-			default:
-				free(command);
-		}
-	}
-}
-
-void searchPackages(int os, char *packages)
-{
-	if ( strlen(packages) > 0 )
-	{
-		char* command = (char *) calloc(strlen(packages) + 80, sizeof(char));
-		switch(os)
-		{
-			case pacman:
-				strcpy(command, "pacman -Ss ");
-				strcat(command, packages);
-				system(command);
-				free(command);
-				break;
-
-			case apt:
-				strcpy(command, "apt search ");
-				strcat(command, packages);
-				system(command);
-				free(command);
-				break;
-
-			case emerge:
-				strcpy(command, "emerge -s ");
-				strcat(command, packages);
-				system(command);
-				free(command);
-				break;
-
-			case xbps:
-				strcpy(command, "xbps-query -Rs ");
-				strcat(command, packages);
-				system(command);
-				free(command);
-				break;
-
-			default:
-				free(command);
-		}
-	}
-}
-
-void updatePackages(int os)
-{
-	switch(os)
-	{
-		case pacman:
-			system("pacman -Syyuu");
-			break;
-
-		case apt:
-			system("apt update && apt upgrade -y");
-			break;
-
-		case emerge:
-			system("emerge-webrsync && emerge -uaqDU --keep-going --with-bdeps=y --newuse @world");
-			break;
-
-		case xbps:
-			system("xbps-install -Su");
-	}
-}
diff --git a/actions.h b/actions.h
deleted file mode 100644
index d7991a6..0000000
--- a/actions.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "utils.h"
-
-void actions(char action, char* packages);
-void cleanPackages(int os);
-void help();
-void installPackages(int os, char* packages);
-void queryPackages(int os);
-void removePackages(int os, char* packages);
-void searchPackages(int os, char* packages);
-void updatePackages(int os);
diff --git a/flags.c b/flags.c
new file mode 100644
index 0000000..e103aee
--- /dev/null
+++ b/flags.c
@@ -0,0 +1,240 @@
+#include <stdlib.h>
+#include <string.h>
+#include "flags.h"
+
+void flags(char flag, char* packages)
+{
+	int os = detectOsType();
+	switch (flag)
+	{
+		case 'c':
+			cleanPackages(os);
+			break;
+
+		case 'h':
+			help();
+			break;
+
+		case 'i':
+			installPackages(os, packages);
+			break;
+
+		case 'q':
+			queryPackages(os);
+			break;
+
+		case 'r':
+			removePackages(os, packages);
+			break;
+
+		case 's':
+			searchPackages(os, packages);
+			break;
+
+		case 'u':
+			updatePackages(os);
+			break;
+
+		default:
+			puts("Command not found");
+			help();
+	}
+}
+
+void cleanPackages(int os)
+{
+	switch(os)
+	{
+		case pacman:
+			system("pacman -Rns \"$(pacman -Qtdq)\" || pacman -Scc");
+			break;
+
+		case apt:
+			system("apt autoremove --purge || apt clean");
+			break;
+
+		case emerge:
+			system("emerge -caq");
+			break;
+
+		case xbps:
+			system("xbps-remove -ROo");
+	}
+}
+
+void help()
+{
+	printf("PKG Options:\n"
+			"c - removes orphans and cleans the package cache\n"
+			"h - display this message\n"
+			"i - installs selected packages\n"
+			"q - display installed packages\n"
+			"r - remove a selected package\n"
+			"s - look up for a package in the available repositories\n"
+			"u - updates repos and packages\n\n");
+}
+
+void installPackages(int os, char *packages)
+{
+	if ( strlen(packages) > 0 )
+	{
+		char* command = (char *) calloc(strlen(packages) + 80, sizeof(char));
+		switch(os)
+		{
+			case pacman:
+				strcpy(command, "pacman -S ");
+				strcat(command, packages);
+				system(command);
+				free(command);
+				break;
+
+			case apt:
+				strcpy(command, "apt install ");
+				strcat(command, packages);
+				system(command);
+				free(command);
+				break;
+
+			case emerge:
+				strcpy(command, "emerge -aq ");
+				strcat(command, packages);
+				system(command);
+				free(command);
+				break;
+
+			case xbps:
+				strcpy(command, "xbps-install -S ");
+				strcat(command, packages);
+				system(command);
+				free(command);
+				break;
+
+			default:
+				free(command);
+		}
+	}
+}
+
+void queryPackages(int os)
+{
+	switch(os)
+	{
+		case pacman:
+			system("pacman -Qs");
+			break;
+
+		case apt:
+			system("apt list --installed");
+			break;
+
+		case emerge:
+			system("cd /var/db/pkg/ && ls -d */* | sed 's:\\/$::'");
+			break;
+
+		case xbps:
+			system("xbps-query -l");
+	}
+}
+
+void removePackages(int os, char *packages)
+{
+	if ( strlen(packages) > 0 )
+	{
+		char* command = (char *) calloc(strlen(packages) + 80, sizeof(char));
+		switch(os)
+		{
+			case pacman:
+				strcpy(command, "pacman -Rnsc ");
+				strcat(command, packages);
+				system(command);
+				free(command);
+				break;
+
+			case apt:
+				strcpy(command, "apt autoremove --purge ");
+				strcat(command, packages);
+				system(command);
+				free(command);
+				break;
+
+			case emerge:
+				strcpy(command, "emerge -caq ");
+				strcat(command, packages);
+				system(command);
+				free(command);
+				break;
+
+			case xbps:
+				strcpy(command, "xbps-remove -ROo ");
+				strcat(command, packages);
+				system(command);
+				free(command);
+				break;
+
+			default:
+				free(command);
+		}
+	}
+}
+
+void searchPackages(int os, char *packages)
+{
+	if ( strlen(packages) > 0 )
+	{
+		char* command = (char *) calloc(strlen(packages) + 80, sizeof(char));
+		switch(os)
+		{
+			case pacman:
+				strcpy(command, "pacman -Ss ");
+				strcat(command, packages);
+				system(command);
+				free(command);
+				break;
+
+			case apt:
+				strcpy(command, "apt search ");
+				strcat(command, packages);
+				system(command);
+				free(command);
+				break;
+
+			case emerge:
+				strcpy(command, "emerge -s ");
+				strcat(command, packages);
+				system(command);
+				free(command);
+				break;
+
+			case xbps:
+				strcpy(command, "xbps-query -Rs ");
+				strcat(command, packages);
+				system(command);
+				free(command);
+				break;
+
+			default:
+				free(command);
+		}
+	}
+}
+
+void updatePackages(int os)
+{
+	switch(os)
+	{
+		case pacman:
+			system("pacman -Syyuu");
+			break;
+
+		case apt:
+			system("apt update && apt upgrade -y");
+			break;
+
+		case emerge:
+			system("emerge-webrsync && emerge -uaqDU --keep-going --with-bdeps=y --newuse @world");
+			break;
+
+		case xbps:
+			system("xbps-install -Su");
+	}
+}
diff --git a/flags.h b/flags.h
new file mode 100644
index 0000000..065bdc5
--- /dev/null
+++ b/flags.h
@@ -0,0 +1,10 @@
+#include "utils.h"
+
+void flags(char flag, char* packages);
+void cleanPackages(int os);
+void help();
+void installPackages(int os, char* packages);
+void queryPackages(int os);
+void removePackages(int os, char* packages);
+void searchPackages(int os, char* packages);
+void updatePackages(int os);
diff --git a/logo.png b/logo.png
new file mode 100644
index 0000000..09ead20
Binary files /dev/null and b/logo.png differ
diff --git a/pkg.c b/pkg.c
index d2a34d7..fb03186 100644
--- a/pkg.c
+++ b/pkg.c
@@ -1,23 +1,17 @@
 #include <stdlib.h>
-#include "actions.h"
-
-/*
- **********************************************************
- * All in One Package Manager for easier "Distro Hopping" *
- **********************************************************
- */
+#include "flags.h"
 
 int main(int argc, char **argv)
 {
 	if ( argc > 1 )
 	{
 		char* arg = stringedArgument(argc, argv);
-		actions(*(argv[1]), arg);
+		flags(*(argv[1]), arg);
 		free(arg);
 	}
 	else
 	{
-		actions('h', "");
+		flags('h', "");
 	}
 
 	return 0;
-- 
cgit v1.2.3