add more config options

Author: cf

Makefile

@@ -2,7 +2,7 @@ SRC = src/fetch.c
 CC ?= cc
 CFLAGS = -O2 -std=c99 -Wall -Wextra
 LDFLAGS = -lpthread
-DEBUGFLAGS = -g
+DEBUGFLAGS = -g -Og -std=c99 -Wall -Wextra
 PREFIX ?= /usr/local
 
 all: afetch
@@ -11,10 +11,10 @@ afetch: ${SRC} src/config.h src/colour.h
 	${CC} ${CFLAGS} ${SRC} ${LDFLAGS} -o afetch
 
 debug:
-	${CC} ${CFLAGS} ${DEBUGFLAGS} ${SRC} ${LDFLAGS} -o afetch-debug
+	${CC}  ${DEBUGFLAGS} ${SRC} ${LDFLAGS} -o afetch-debug
 
 clean:
-	rm -rf afetch afetch.dSYM
+	rm -rf afetch afetch.dSYM afetch-debug afetch-debug.dSYM
 
 install:
 	mkdir -p ${DESTDIR}${PREFIX}/bin

README.md

@@ -5,7 +5,8 @@
 
 <p align=center>Fast and simple system info (for UNIX based operating systems) written in POSIX compliant C99, that can be configured at compile time by editing the <a href="src/config.h">config.h</a> file. It uses the C Preprocessor to implement config options at compile time. <br> <br>
 
-`afetch` is a command line tool that is made to be compiled and run anywhere, as long as you have the POSIX header files and pthreads/ </p>
+<h3 align="center"> Why use afetch? </h3>
+<p align="center"> afetch is written in C99, meaning that it should be able to be compiled with almost all C compilers. As well as being written in a very fast language, it's multithreaded. This makes it even faster, as well as distinguishing it from similar programs written is POSIX sh. The only limitations it has is the speed of your distros package manager! </p>
 
 **Requirements**
 *  `/etc/os-release` file for package count on Linux
@@ -52,6 +53,8 @@ If on Linux, please show me the contents of the `/etc/os-release` file.
 
 **Configuration options**
 *  Custom text for each seperate row of info
+*  Force lowercase text for OS name
+*  Option to print colour blocks or not
 *  More to be implemented soon
 
 

src/config.h

@@ -1,11 +1,13 @@
-#define UserText    "   USER "//
-#define OsText      "     OS "//
-#define KernelText  " KERNEL "//
-#define UptimeText  " UPTIME "//
-#define ShellText   "  SHELL "//
-#define PackageText "   PKGS "//
+#define UserText    "   USER "  //
+#define OsText      "     OS "  //
+#define KernelText  " KERNEL "  //
+#define UptimeText  " UPTIME "  //
+#define ShellText   "  SHELL "  //
+#define PackageText "   PKGS "  //
 
-#define PrintColours false //must be either 'true' or 'false'
+#define ForceLowerCase false     //must be either 'true' or 'false'
+
+#define PrintColours false      //must be either 'true' or 'false'
 #define ColourCharacter "● "
 
 /* Some examples of things you may want to use for your ColourCharacter

src/fetch.c

@@ -20,6 +20,15 @@ char *username, *osname, *shellname, *pkgCount;
 char *krnlver;
 long uptimeH, uptimeM;
 
+char *lowerCase(char *str) {
+	if (ForceLowerCase == false) return str;
+	int len = strlen(str);
+	for (int i=0; i<len;i++){
+		if (str[i] >= 'A' && str[i] <= 'Z') {
+			str[i] += 32; }
+	}
+	return str;
+}
 
 
 char *pipeRead(const char *exec){
@@ -63,6 +72,12 @@ void *uptime(){
 
 void *user(){
 	username = getenv("USER");
+	
+	/* I'm not sure if lower case usernames
+	   are allowed in UNIX-like operating 
+	   systems. I'll have to look into it */
+	//username = lowerCase(username);
+	
 	return NULL;
 }
 
@@ -79,7 +94,9 @@ void *shell(){
 void *os(){
 	static struct utsname sysInfo;
 	uname(&sysInfo);
-
+	//start
+		/* This whole section could probably be rewritten - it seems 
+		   like a bit of a mess right now */
 	if (strncmp(sysInfo.sysname, "Linux", 5)==0) {
 		char *osContents = malloc(512);
 		char *newContents = malloc(512);
@@ -107,7 +124,7 @@ void *os(){
     			osname = malloc(512);
 		strcpy(osname, newContents);
 		free(newContents);
-
+	//end
 		while (1){
 			if (strncmp(osname, "Alpine Linux", 12) == 0) {
 				info.col1 = BBLUE"\n";
@@ -399,6 +416,7 @@ void *os(){
 	}
 	pkgCount = pipeRead(info.getPkgCount);
 
+	osname = lowerCase(osname);
 	return NULL;
 }
 
@@ -434,7 +452,7 @@ int main(){
 	pthread_join(threads[1], NULL); //os function must be run to get info.col1
 	printf("%s", info.col1);
 	printf("%s    %s%s%s\n", info.col2, UserText ,WHITE, username);
-	printf("%s    %s%s%s\n", info.col3,OsText, WHITE, osname);
+	printf("%s    %s%s%s\n", info.col3, OsText , WHITE, osname);
 	pthread_join(threads[2], NULL);
 	printf("%s    %s%s%s\n", info.col4,KernelText,WHITE, krnlver);
 	pthread_join(threads[3], NULL);
@@ -447,6 +465,5 @@ int main(){
 	pthread_create(&threads[5], NULL, colourDraw, NULL);
 	pthread_join(threads[5], NULL);
 	printf("%s", RESET);
-
 	return 0;
 }