From 00a2251823f133ccc730de9cfc4867080e50fd0f Mon Sep 17 00:00:00 2001
From: Marcus Whybrow <marcus@marcuswhybrow.net>
Date: Sat, 3 Nov 2012 21:20:16 +0000
Subject: [PATCH] Move install process to a sourceable function

---
 installers/common.sh  | 30 ++++++++++++++++++++++++++++++
 installers/debian.sh  |  2 +-
 installers/install.sh | 27 ---------------------------
 installers/redhat.sh  |  2 +-
 4 files changed, 32 insertions(+), 29 deletions(-)
 delete mode 100644 installers/install.sh

diff --git a/installers/common.sh b/installers/common.sh
index cbdc5c8..96ee783 100644
--- a/installers/common.sh
+++ b/installers/common.sh
@@ -141,3 +141,33 @@ function update_msm() {
 function install_complete() {
     install_log "Done. Type 'msm help' to get started. Have fun!"
 }
+
+function install() {
+    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 install functions as sudo
+    # These functions are defined in another script
+    # after which this script is sourced
+    sudo sh <<SCRIPT
+
+        config_installation
+        update_system_packages
+        install_dependencies
+        add_minecraft_user
+        create_msm_directories
+        download_latest_files
+        patch_latest_files
+        install_config
+        install_cron
+        reload_cron
+        install_init
+        enable_init
+        update_msm
+        install_complete
+
+    SCRIPT
+}
diff --git a/installers/debian.sh b/installers/debian.sh
index 6b3cbed..8dca361 100755
--- a/installers/debian.sh
+++ b/installers/debian.sh
@@ -31,4 +31,4 @@ function enable_init() {
     fi
 }
 
-bash <(wget -qO- https://raw.github.com/marcuswhybrow/minecraft-server-manager/master/installers/install.sh)
+install
diff --git a/installers/install.sh b/installers/install.sh
deleted file mode 100644
index 55a5f51..0000000
--- a/installers/install.sh
+++ /dev/null
@@ -1,27 +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 install functions as sudo
-# These functions are defined in another script
-# after which this script is sourced
-sudo sh <<SCRIPT
-
-    config_installation
-    update_system_packages
-    install_dependencies
-    add_minecraft_user
-    create_msm_directories
-    download_latest_files
-    patch_latest_files
-    install_config
-    install_cron
-    reload_cron
-    install_init
-    enable_init
-    update_msm
-    install_complete
-
-SCRIPT
diff --git a/installers/redhat.sh b/installers/redhat.sh
index 58482e6..eb19b47 100644
--- a/installers/redhat.sh
+++ b/installers/redhat.sh
@@ -20,4 +20,4 @@ function enable_init() {
     chkconfig --add msm
 }
 
-source <(wget -qO- https://raw.github.com/marcuswhybrow/minecraft-server-manager/master/installers/install.sh)
+install