refactored logos and display functions, significant code reorganization

README.md

@@ -1,7 +1,7 @@
 screenfetch-c
 =============
 
-## Current Version: 1.2 release 
+## Current Version: 1.3 (release) 
 
 screenfetch-c is an attempt to rewrite screenFetch, a popular shell 
 script that displays system information and an ASCII logo, in the C 
@@ -145,4 +145,4 @@ _Note:_ These are only the ones that have actually been tested (so far). screenf
 ## License
 screenfetch-c is licensed under the MIT license.
 
-For the exact terms, see the [license file](./LICENSE).
+For the exact terms, see the [license](./LICENSE).

makefile

@@ -1,17 +1,17 @@
-CC=gcc
-CFLAGS=-O3 -std=c99 -Wall -Wunused-variable
-CFLAGS_LINUX=-Wno-unused-result
-LDFLAGS_OSX=-lpthread -framework CoreServices
-LDFLAGS_BSD=-lpthread
-LDFLAGS_LINUX=-lpthread -lX11 -lGL
-LDFLAGS_SOLARIS=-lpthread -lX11
-INSTALL=/usr/bin/install -c
+CC = gcc
+CFLAGS = -O3 -std=c99 -Wall -Wunused-variable
+CFLAGS_LINUX = -Wno-unused-result
+LDFLAGS_OSX = -lpthread -framework CoreServices
+LDFLAGS_BSD = -lpthread
+LDFLAGS_LINUX = -lpthread -lX11 -lGL
+LDFLAGS_SOLARIS = -lpthread -lX11
+INSTALL = /usr/bin/install -c
 
-PREFIX=/usr/local
-BIN=$(PREFIX)/bin
-MAN=$(PREFIX)/share/man/man1
+PREFIX = /usr/local
+BIN = $(PREFIX)/bin
+MAN = $(PREFIX)/share/man/man1
 
-SOURCES=./src/*.c
+SOURCES = ./src/*.c
 
 all:
 	@echo '========================================================='
@@ -36,11 +36,11 @@ win:
 
 install:
 	$(INSTALL) screenfetch-c $(BIN)/screenfetch-c
-	$(INSTALL) ./src/detectde $(BIN)/detectde
-	$(INSTALL) ./src/detectgtk $(BIN)/detectgtk
-	$(INSTALL) ./src/detectwm $(BIN)/detectwm
-	$(INSTALL) ./src/detectwmtheme $(BIN)/detectwmtheme
-	$(INSTALL) ./src/detectgpu $(BIN)/detectgpu
+	$(INSTALL) ./src/scripts/detectde $(BIN)/detectde
+	$(INSTALL) ./src/scripts/detectgtk $(BIN)/detectgtk
+	$(INSTALL) ./src/scripts/detectwm $(BIN)/detectwm
+	$(INSTALL) ./src/scripts/detectwmtheme $(BIN)/detectwmtheme
+	$(INSTALL) ./src/scripts/detectgpu $(BIN)/detectgpu
 	mkdir -p $(MAN)
 	$(INSTALL) ./manpage/screenfetch-c.1 $(MAN)/screenfetch-c.1
 

manpage/screenfetch-c.1

@@ -1,6 +1,6 @@
 .\" Manpage for screenfetch-c
 .\" Contact woodruffw on GitHub or at william @ tuffbizz.com to report any bugs or errors
-.TH screenfetch-c 1 "04 August 2013" "1.2r" "User Commands" 
+.TH screenfetch-c 1 "04 August 2013" "1.3r" "User Commands" 
 .SH NAME
 \fBscreenfetch-c\fP - Display computer information and an ASCII logo
 
@@ -89,15 +89,17 @@ Each of these variables must be defined properly in order for \fBscreenfetch-c\f
 .SH RELEASE HISTORY
 Note: Revisions are not counted in the release history.
 
-\fB0.1\fP - ALPHA - INCOMPLETE, UNCOMPILED
+\fI0.1\fP - ALPHA - INCOMPLETE, UNCOMPILED
 
-\fB0.5\fP - ALPHA - INCOMPLETE, TEST COMPILED
+\fI0.5\fP - ALPHA - INCOMPLETE, TEST COMPILED
 
-\fB1.0\fP - BETA - LACKING MINOR PARTS, STABLE, WORKING ON MOST SYSTEMS
+\fI1.0\fP - BETA - LACKING MINOR PARTS, STABLE, WORKING ON MOST SYSTEMS
 
-\fB1.1\fP - BETA - NEARLY COMPLETE, MINOR BUGS AND GPU DETECTION NOT FINISHED
+\fI1.1\fP - BETA - NEARLY COMPLETE, MINOR BUGS AND GPU DETECTION NOT FINISHED
 
-\fB1.2\fP - RELEASE - WORKS ON THE MAJORITY OF SYSTEMS
+\fI1.2\fP - RELEASE - WORKS ON THE MAJORITY OF SYSTEMS
+
+\fI1.3\fP - RELEASE - SIGNIFICANT REFACTORING AND PERFORMANCE IMPROVEMENTS
 
 .SH BUGS AND ERRATIC BEHAVIOR
 Shell version detection relies of very specific naming schemes and may appear incorrectly if any shell changes its versioning scheme.