Restructured Modules, Removed Useless Code (Package Cleanup Post Inst…

…all), Removed Outdated Documentation, Added Several Placeholder Modules, Removed Broken Benchmarking Script, Renamed phpMyAdmin Script, Renamed Many Scripts, Updated Main Loader & Readme

README.md

@@ -73,6 +73,5 @@ Sample Commands
 	bash minstall.sh http-install-mysql
 	bash minstall.sh http-install-nginx
 	bash minstall.sh http-install-php
-	bash minstall.sh http-install-php-extra
 	bash minstall.sh http-configure-mysql
 	bash minstall.sh http-configure-nginx

documents/Using Extra Scripts.txt

@@ -1,5 +1,4 @@
-Minstall includes some extra scripts, two examples being the benchmark enviroment setup script and the phpMyAdmin script.
-These scripts may be used independantly to Minstall and aren't dependant on it.
+Minstall includes some extra scripts. These scripts may be used independantly to Minstall and aren't dependant on it.
 Some may however require the changing of parameters in the script files to ensure proper setup and operation.
 Please be sure to understand what each script does and update the variables in the variable section of each script before using.
 Hopefully you'll find the scripts useful!

libraries/20.package.sh

@@ -18,21 +18,3 @@ function package_update_question() {
 		PACKAGE_LIST_UPDATE=1
 	fi
 }
-
-# Set Package List Clean Variable
-PACKAGE_LIST_CLEAN=0
-
-# Package List Clean Question
-function package_clean_question() {
-	# Check If Package List Clean Needs To Be Run
-	if [ $PACKAGE_LIST_CLEAN = 1 ] && [ "$1" = "1" ]; then
-		# Ask Question
-		if question --default yes "Do you want to clean the package cache? (Y/n)" || [[ $UNATTENDED = 1 && $(read_var minstall__package_clean) = 1 ]]; then
-			# Clean Package Cache
-			package_clean
-		fi
-	fi
-
-	# Set Package List Clean Variable
-	PACKAGE_LIST_CLEAN=1
-}

minstall.sh

@@ -74,15 +74,15 @@ if [ $UNATTENDED = 0 ]; then
 		# Help Function
 		help)
 			# Load Help Script
-			source $MODULEPATH/help.sh
+			source $MODULEPATH/help/init.sh
 
 			# Exit
 			exit
 		;;
 		# Module List Function
 		modules)
 			# Load Module Listing Script
-			source $MODULEPATH/help-modules.sh
+			source $MODULEPATH/help-modules/init.sh
 
 			# Exit
 			exit
@@ -101,12 +101,12 @@ if [ $UNATTENDED = 0 ]; then
 				MODULELIST=${MODULELIST#*\,}
 
 				# Check If Module Exists
-				if [ -f $MODULEPATH/$MODULE.sh ]; then
+				if [ -f $MODULEPATH/$MODULE/init.sh ]; then
 					# Print Module Description
-					header $(describe $MODULEPATH/$MODULE.sh)
+					header $(describe $MODULEPATH/$MODULE/init.sh)
 
 					# Load Module
-					source $MODULEPATH/$MODULE.sh
+					source $MODULEPATH/$MODULE/init.sh
 				# Module Doesn't Exist
 				else
 					# Ask If User Wants To Abort
@@ -152,12 +152,12 @@ if [ $UNATTENDED = 1 ]; then
 		fi
 
 		# Check If Module Exists
-		if [ -f $MODULEPATH/$MODULE.sh ]; then
+		if [ -f $MODULEPATH/$MODULE/init.sh ]; then
 			# Print Module Description
-			header $(describe $MODULEPATH/$MODULE.sh)
+			header $(describe $MODULEPATH/$MODULE/init.sh)
 
 			# Load Module
-			source $MODULEPATH/$MODULE.sh
+			source $MODULEPATH/$MODULE/init.sh
 		# Module Doesn't Exist
 		else
 			# Print Message

modules/help-modules.sh → modules/help-modules/init.sh

@@ -5,6 +5,6 @@
 header "Module Name - Description"
 
 # Loop Through Modules
-for file in $MODULEPATH/*.sh; do
-	list $file
+for module in $MODULEPATH/*/init.sh; do
+	list $module
 done

modules/http-install-mysql.sh → modules/install-database-mysql/init.sh

@@ -71,6 +71,3 @@ cp -r $MODULEPATH/$MODULE/mysql/* /etc/mysql/
 # Start Daemon
 subheader "Starting Daemon..."
 daemon_manage mysql start
-
-# Package List Clean Question
-package_clean_question

modules/install-extra-packages.sh → modules/install-extra-packages/init.sh

@@ -24,6 +24,3 @@ done
 
 # Unset Array
 unset PACKAGELIST
-
-# Package List Clean Question
-package_clean_question

modules/install-extra-repositories.sh → modules/install-extra-repositories/init.sh

@@ -37,6 +37,3 @@ unset REPOLIST
 
 # Update Package Lists
 package_update
-
-# Package List Clean Question
-package_clean_question

modules/http-install-php.sh → modules/install-framework-php/init.sh

@@ -25,6 +25,3 @@ cp -r $MODULEPATH/$MODULE/php5/* /etc/php5/
 # Restart Daemon
 subheader "Restarting Daemon..."
 daemon_manage php5-fpm restart
-
-# Package List Clean Question
-package_clean_question

modules/http-install-php-extra.sh → modules/install-framework-php/temp/http-install-php-extra.sh

@@ -47,6 +47,3 @@ if check_package "nginx"; then
 	subheader "Restarting Daemon (nginx)..."
 	daemon_manage nginx restart
 fi
-
-# Package List Clean Question
-package_clean_question

modules/http-install-nginx.sh → modules/install-http-nginx/init.sh

@@ -54,6 +54,3 @@ fi
 # Restart Daemon
 subheader "Restarting Daemon..."
 daemon_manage nginx restart
-
-# Package List Clean Question
-package_clean_question

modules/http-install-exim.sh → modules/install-mail-exim/init.sh

@@ -18,6 +18,3 @@ sed -i "s/dc_eximconfig_configtype='local'/dc_eximconfig_configtype='internet'/"
 # Restart Daemon
 subheader "Restarting Daemon..."
 daemon_manage exim4 restart
-
-# Package List Clean Question
-package_clean_question

modules/install-dropbear.sh → modules/install-terminal-dropbear/init.sh

@@ -14,7 +14,7 @@ if ! (question --default yes "Do you still want to run this module? (Y/n)" || [
 fi
 
 # Set Module
-MODULE=install-dropbear
+MODULE=install-terminal-dropbear
 
 # Install Package
 subheader "Installing Package..."
@@ -26,7 +26,7 @@ cp -r $MODULEPATH/$MODULE/default/* /etc/default/
 
 # Install OpenSSH SFTP Support
 subheader "Installing OpenSSH SFTP Support..."
-source $MODULEPATH/install-ssh.sh
+source $MODULEPATH/install-terminal-ssh/init.sh
 
 # Remove OpenSSH Daemon
 subheader "Removing OpenSSH Daemon..."
@@ -36,6 +36,3 @@ daemon_remove ssh
 # Restart Daemon
 subheader "Restarting Daemon..."
 daemon_manage dropbear restart
-
-# Package List Clean Question
-package_clean_question

modules/install-ssh.sh → modules/install-terminal-ssh/init.sh

@@ -5,7 +5,7 @@
 package_update_question
 
 # Module Warning
-if [ $MODULE != "install-dropbear" ]; then
+if [ $MODULE != "install-terminal-dropbear" ]; then
 	warning "This package will install the OpenSSH Server. If you want the Dropbear SSH server (they are functionally identical) cancel and run its module instead."
 	if ! (question --default yes "Do you still want to run this module? (Y/n)" || [ $UNATTENDED = 1 ]); then
 		# Skipped Message
@@ -29,6 +29,3 @@ cp -r $MODULEPATH/$MODULE/ssh/* /etc/ssh/
 # Restart Daemon
 subheader "Restarting Daemon..."
 daemon_manage ssh restart
-
-# Package List Clean Question
-package_clean_question