Routine changes
This commit is contained in:
		
							
								
								
									
										34
									
								
								installfull.sh
									
									
									
									
									
										
										
										Executable file → Normal file
									
								
							
							
						
						
									
										34
									
								
								installfull.sh
									
									
									
									
									
										
										
										Executable file → Normal file
									
								
							| @@ -1,24 +1,31 @@ | |||||||
| #!/bin/bash | #!/bin/bash | ||||||
| FILE=/lib/libncursest.so | FILE=Makefile | ||||||
| work_dir="${PWD}" | work_dir="${PWD}" | ||||||
| cores="$(nproc)" | cores="$(nproc)" | ||||||
| curses_url="https://invisible-mirror.net/archives/ncurses/current/ncurses.tar.gz" | 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 | 	        mkdir  ncurses | ||||||
|         wget -q -O- "${curses_url}" | tar -xz -C ncurses | 	        wget -q -O- "${curses_url}" | tar -xz -C ncurses | ||||||
|         echo "Fetched ncurses source code from ${curses_url}..." | 	        echo "Fetched ncurses source code from ${curses_url}..." | ||||||
|  | 	fi | ||||||
|         cd ncurses/*/ || exit |         cd ncurses/*/ || exit | ||||||
|         echo "Runnning configure script..."  |         echo "Runnning configure script..."  | ||||||
|         ./configure --with-pthread --with-shared > /dev/null | 	if test -f "$FILE"; then | ||||||
|         echo "Running make..."          | 		echo "You have already compiled ncurses. Skipping this step..." | ||||||
|         make -j"${cores}" > /dev/null | 		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 | 	cd lib || exit | ||||||
| 	FILE=libncursest.so.?.? | 	FILE=libncursest.so.?.? | ||||||
| 	 | 	 | ||||||
| #fi |  | ||||||
| 	if ls /lib/${FILE} 1> /dev/null 2>&1 ; then | 	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 "You have a version of ncurses that was identical to the one that was compiled." | ||||||
| 		echo " Quitting..." | 		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 | 		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 "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..." | 			echo "Installing the new version of ncurses..." | ||||||
|  | 			cd ../ || exit | ||||||
| 			sudo make install | 			sudo make install | ||||||
| 			echo "The new version has been installed. The program will now quit." | 			echo "The new version has been installed. The program will now quit." | ||||||
| 			echo "Quitting..." | 			echo "Quitting..." | ||||||
|   | |||||||
| @@ -648,7 +648,7 @@ int main(int argc,char** argv) { | |||||||
| 	 | 	 | ||||||
| 				case ('n' & 0x1f): | 				case ('n' & 0x1f): | ||||||
| //					WINDOW* newFileWin = newwin(6,50,mainY/2-3,mainX/2-25); | //					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* newFileLoc = getSaveLoc(mainX,mainY,"$$$"); | ||||||
| 					char* newSaveLoc = malloc(sizeof(char) * (strlen(dir) + strlen(newFileLoc)) + 1); | 					char* newSaveLoc = malloc(sizeof(char) * (strlen(dir) + strlen(newFileLoc)) + 1); | ||||||
| 					strcpy(newSaveLoc,dir); | 					strcpy(newSaveLoc,dir); | ||||||
| @@ -664,6 +664,8 @@ int main(int argc,char** argv) { | |||||||
| 					break; | 					break; | ||||||
|  |  | ||||||
| 				case ('p' & 0x1f): | 				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); | 					char* tempFileDir = malloc(sizeof(char) * MAX_LINE_LENGTH); | ||||||
| 					strcpy(tempFileDir,dir); | 					strcpy(tempFileDir,dir); | ||||||
| //					strcat(tempFileDir,"/"); | //					strcat(tempFileDir,"/"); | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user