Updated .gitattributes

.gitattributes

@@ -0,0 +1 @@
+*.h linguist-language=Header

Makefile

@@ -10,6 +10,7 @@ full:
 pdcurses:
 	make program3-4-pdcurses
 program3-4-pdcurses: program3-4.c texted.c fileman.c
+	./installpdcurses.sh
 	sed -i 's/<ncurses.h>/"pdcurses\/curses.h"/g' texted.h
 	sed -i 's/<ncurses.h>/"pdcurses\/curses.h"/g' fileman.h
 	sed -i 's/for (int i=0,a=0;i<numCharsToPrint;i++,a++)/for (int i=0,a=0;i<numCharsToPrint-1;i++,a++)/g' program3-4.c

installfull.sh

@@ -1,24 +1,31 @@
 #!/bin/bash
-FILE=/lib/libncursest.so
+FILE=Makefile
 work_dir="${PWD}"
 cores="$(nproc)"
 curses_url="https://invisible-mirror.net/archives/ncurses/current/ncurses.tar.gz"
-#if test -f "$FILE"; then
+	if [ -d "ncurses" ]
-#       echo "$FILE exists; skipping ncurses compile."
+	then
-#else
+		echo "You have already fetched the ncurses source code. Skipping this step..."
-#        echo "$FILE does not exist, fetching and compiling ncurses source code now..."
+	else
 	        mkdir  ncurses
 	        wget -q -O- "${curses_url}" | tar -xz -C ncurses
 	        echo "Fetched ncurses source code from ${curses_url}..."
+	fi
         cd ncurses/*/ || exit
         echo "Runnning configure script..." 
+	if test -f "$FILE"; then
+		echo "You have already compiled ncurses. Skipping this step..."
+		echo "However, ensure that you ran the 'configure' script with the '--with-pthread' and '--with-shared' flags."
+		echo ""
+	else
 	        ./configure --with-pthread --with-shared > /dev/null
         	echo "Running make..."         
 	        make -j"${cores}" > /dev/null
+	fi
 	cd lib || exit
 	FILE=libncursest.so.?.?
 	
-#fi
+
 	if ls /lib/${FILE} 1> /dev/null 2>&1 ; then
 		echo "You have a version of ncurses that was identical to the one that was compiled."
 		echo " Quitting..."
@@ -28,9 +35,10 @@ curses_url="https://invisible-mirror.net/archives/ncurses/current/ncurses.tar.gz
 		read -p "Would you like to install the new version? [y/N] " userchoice
 
 
-		if [ "$userchoice" = "Y" ]; then
+		if [ "$userchoice" = "y" ]; then
 			echo "The program will now attempt to install the new version of ncurses (the one that was just compiled). In order to do this, the sudo password is required."
 			echo "Installing the new version of ncurses..."
+			cd ../ || exit
 			sudo make install
 			echo "The new version has been installed. The program will now quit."
 			echo "Quitting..."

installpdcurses.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+FILE=/lib/libncursest.so
+work_dir="${PWD}"
+cores="$(nproc)"
+curses_url="https://github.com/wmcbrine/PDCurses.git"
+        mkdir pdcurses
+        git clone "${curses_url}" pdcurses
+        echo "Fetched pdcurses source code from ${curses_url}..."
+        cd pdcurses/sdl2 || exit
+        echo "Running make..."         
+        make -j"${cores}" > /dev/null
+	echo "PDCurses has been compiled, and will be linked statically."
+
+#	cd lib || exit
+#	FILE=libncursest.so.?.?
+	
+#	if ls /lib/${FILE} 1> /dev/null 2>&1 ; then
+#		echo "You have a version of ncurses that was identical to the one that was compiled."
+#		echo " Quitting..."
+#		exit
+#	else
+#		echo "You have a different version of ncurses than the one that was just compiled."
+#		read -p "Would you like to install the new version? [y/N] " userchoice
+#
+#
+#		if [ "$userchoice" = "Y" ]; then
+#			echo "The program will now attempt to install the new version of ncurses (the one that was just compiled). In order to do this, the sudo password is required."
+#			echo "Installing the new version of ncurses..."
+#			sudo make install
+#			echo "The new version has been installed. The program will now quit."
+#			echo "Quitting..."
+#			exit
+#
+#		else
+#			echo "You chose to not install the new ncurses version. This program will now quit."
+#			echo "Quitting..."
+#			exit			
+#		fi
+#	fi

program3-4.c

@@ -648,7 +648,7 @@ int main(int argc,char** argv) {
 	
 				case ('n' & 0x1f):
 //					WINDOW* newFileWin = newwin(6,50,mainY/2-3,mainX/2-25);
-//					mvwaddstr(newFileWin,1,1,"Enter the name of the file you wish to create");
+					; //Dummy statement - Apparently you can't declare a variable in the first line in a case statment in C without curly braces surrounding the case
 					char* newFileLoc = getSaveLoc(mainX,mainY,"$$$");
 					char* newSaveLoc = malloc(sizeof(char) * (strlen(dir) + strlen(newFileLoc)) + 1);
 					strcpy(newSaveLoc,dir);
@@ -664,6 +664,8 @@ int main(int argc,char** argv) {
 					break;
 
 				case ('p' & 0x1f):
+					; //Dummy statement - Apparently you can't declare a variable in the first line in a case statment in C without curly braces surrounding the case
+
 					char* tempFileDir = malloc(sizeof(char) * MAX_LINE_LENGTH);
 					strcpy(tempFileDir,dir);
 //					strcat(tempFileDir,"/");