From 693dfb13fd4167bd8082c7b3beddbb09c28151c6 Mon Sep 17 00:00:00 2001
From: Marcus Whybrow <marcus@marcuswhybrow.net>
Date: Thu, 13 Sep 2012 19:55:31 +0100
Subject: [PATCH] Make install script accessible via HTTP

---
 install-debian.sh        |  2 --
 install-redhat.sh        |  2 --
 install.sh               | 47 ----------------------------------------
 installers/common.sh     | 33 +++++++++++++++++++---------
 installers/debian.sh     |  4 +++-
 installers/defaults.conf |  4 ----
 installers/install.sh    |  9 ++++----
 installers/redhat.sh     |  4 +++-
 8 files changed, 33 insertions(+), 72 deletions(-)
 delete mode 100644 install-debian.sh
 delete mode 100644 install-redhat.sh
 delete mode 100644 install.sh
 delete mode 100644 installers/defaults.conf

diff --git a/install-debian.sh b/install-debian.sh
deleted file mode 100644
index 6a6f7d3..0000000
--- a/install-debian.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-cd installers
-bash install.sh debian.sh
diff --git a/install-redhat.sh b/install-redhat.sh
deleted file mode 100644
index 413edf3..0000000
--- a/install-redhat.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-cd installers
-bash install.sh redhat.sh
diff --git a/install.sh b/install.sh
deleted file mode 100644
index 35b5e1b..0000000
--- a/install.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-echo "This script requires superuser access to install files to /etc."
-echo "You will be prompted for your password by sudo."
-
-# Clear existing sudo credentials
-sudo -k
-
-# run script as sudo
-sudo sh <<SCRIPT
-
-	echo "\033[1;32mMSM INSTALL: Updating sources\033[m"
-	apt-get update
-
-	echo "\n\033[1;32mMSM INSTALL: Installing required packages\033[m"
-	apt-get install screen rsync zip
-
-	echo "\n\033[1;32mMSM INSTALL: Creating default user \"minecraft\"\033[m"
-	adduser --system minecraft
-
-	echo "\n\033[1;32mMSM INSTALL: Creating MSM directories\033[m"
-	mkdir -p /opt/msm
-	chown minecraft:minecraft /opt/msm
-
-	echo "\n\033[1;32mMSM INSTALL: Downloading latest MSM configuration file\033[m"
-	wget https://raw.github.com/marcuswhybrow/minecraft-server-manager/latest/msm.conf -O /etc/msm.conf
-
-	echo "\n\033[1;32mMSM INSTALL: Downloading latest MSM cron file\033[m"
-	wget https://raw.github.com/marcuswhybrow/minecraft-server-manager/latest/cron/msm -O /etc/cron.d/msm
-	service cron reload
-
-	echo "\n\033[1;32mMSM INSTALL: Downloading latest MSM version\033[m"
-	wget https://raw.github.com/marcuswhybrow/minecraft-server-manager/latest/init/msm -O /etc/init.d/msm
-
-	echo "\n\033[1;32mMSM INSTALL: Giving it the necessary permissions\033[m"
-	chmod 755 /etc/init.d/msm
-
-	echo "\n\033[1;32mMSM INSTALL: Enabling automatic startup and shutdown\033[m"
-	update-rc.d msm defaults
-
-	echo "\n\033[1;32mMSM INSTALL: Making MSM accessible as the command \"msm\"\033[m"
-	ln -s /etc/init.d/msm /usr/local/bin/msm
-
-	echo "\n\033[1;32mMSM INSTALL: Asking MSM to update itself\033[m"
-	/etc/init.d/msm update --noinput
-
-	echo "\n\033[1;32mMSM INSTALL: Done. Type \"msm help\" to get started. Have fun!\033[m"
-
-SCRIPT
\ No newline at end of file
diff --git a/installers/common.sh b/installers/common.sh
index 4464ac0..e4e8e83 100644
--- a/installers/common.sh
+++ b/installers/common.sh
@@ -1,9 +1,5 @@
-if [ -f defaults.conf ]; then
-    source defaults.conf
-fi
-
-msm_dir="${MSM_DIRECTORY:-/opt/msm}"
-msm_user="${MSM_USERNAME:-minecraft}"
+msm_dir="/opt/msm"
+msm_user="minecraft"
 dl_dir="$(mktemp -t msm)"
 
 # Outputs an MSM INSTALL log line
@@ -20,15 +16,32 @@ function install_error() {
 ### NOTE: all the below functions are overloadable for system-specific installs
 ### NOTE: some of the below functions MUST be overloaded due to system-specific installs
 
+function config_installation() {
+    install_log "Configure installation"
+    echo -n "Install directory [${msm_dir}]: "
+    read msm_dir
+
+    echo -n "New server user to be created [${msm_user}]: "
+    read msm_user
+
+    echo "Complete installation with these values? [y/N]: "
+    read answer
+
+    if [[ $answer != "y" ]]; then
+        echo "Installation aborted."
+        exit 0
+    else
+}
+
 # Runs a system software update to make sure we're using all fresh packages
 function update_system_packages() {
-# OVERLOAD THIS
+    # OVERLOAD THIS
     install_error "No function definition for update_system_packages"
 }
 
 # Installs additional dependencies (screen, rsync, zip, wget) using system package manager
 function install_dependencies() {
-# OVERLOAD THIS
+    # OVERLOAD THIS
     install_error "No function definition for install_dependencies"
 }
 
@@ -100,7 +113,7 @@ function install_cron() {
 
 # Reloads cron service (if necessary)
 function reload_cron() {
-# OVERLOAD THIS
+    # OVERLOAD THIS
     install_error "No function defined for reload_cron"
 }
 
@@ -115,7 +128,7 @@ function install_init() {
 
 # Enables init script in default runlevels
 function enable_init() {
-# OVERLOAD THIS
+    # OVERLOAD THIS
     install_error "No function defined for enable_init"
 }
 
diff --git a/installers/debian.sh b/installers/debian.sh
index a9e2fbb..5f67b23 100644
--- a/installers/debian.sh
+++ b/installers/debian.sh
@@ -1,4 +1,4 @@
-source common.sh
+source <(wget -qO- https://raw.github.com/marcuswhybrow/minecraft-server-manager/master/installers/common.sh)
 
 function update_system_packages() {
     install_log "Updating sources"
@@ -30,3 +30,5 @@ function enable_init() {
         update-rc.d msm defaults
     fi
 }
+
+source <(wget -qO- https://raw.github.com/marcuswhybrow/minecraft-server-manager/master/installers/install.sh)
diff --git a/installers/defaults.conf b/installers/defaults.conf
deleted file mode 100644
index 298bbd4..0000000
--- a/installers/defaults.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# vim:syn=sh:
-# Configure default MSM username and server directory
-MSM_USERNAME="minecraft"
-MSM_DIRECTORY="/opt/msm"
diff --git a/installers/install.sh b/installers/install.sh
index bc423aa..55a5f51 100644
--- a/installers/install.sh
+++ b/installers/install.sh
@@ -4,13 +4,12 @@ echo "You will be prompted for your password by sudo."
 # Clear existing sudo credentials
 sudo -k
 
-# Get platform-specific install functions from command arguments
-install_file="${1:-debian.sh}"
-
-# run script as sudo
+# Run install functions as sudo
+# These functions are defined in another script
+# after which this script is sourced
 sudo sh <<SCRIPT
 
-    source "$install_file"
+    config_installation
     update_system_packages
     install_dependencies
     add_minecraft_user
diff --git a/installers/redhat.sh b/installers/redhat.sh
index f3c7700..58482e6 100644
--- a/installers/redhat.sh
+++ b/installers/redhat.sh
@@ -1,4 +1,4 @@
-source common.sh
+source <(wget -qO- https://raw.github.com/marcuswhybrow/minecraft-server-manager/master/installers/common.sh)
 
 function update_system_packages() {
     install_log "Updating sources"
@@ -19,3 +19,5 @@ function enable_init() {
     install_log "Enabling automatic startup and shutdown"
     chkconfig --add msm
 }
+
+source <(wget -qO- https://raw.github.com/marcuswhybrow/minecraft-server-manager/master/installers/install.sh)