From ce1295ec623ac257c791802ae6276bf016242f31 Mon Sep 17 00:00:00 2001
From: Marcus Whybrow <marcus@marcuswhybrow.net>
Date: Wed, 11 Jul 2012 07:26:48 +0100
Subject: [PATCH] Changed to correct server conf variable in bash completion.

Was the old DEFAULT_SERVER_CONF, now the new DEFAULT_PROPERTIES.
---
 bash_completion/msm | 2 +-
 msm.conf            | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/bash_completion/msm b/bash_completion/msm
index 39101b3..123da35 100644
--- a/bash_completion/msm
+++ b/bash_completion/msm
@@ -11,7 +11,7 @@ __init() {
 # $1: The name of a server
 __init_server() {
 	SERVER_PATH="$SERVER_STORAGE_PATH/$1"
-	SERVER_CONF="$SERVER_STORAGE_PATH/$1/$DEFAULT_SERVER_CONF"
+	SERVER_CONF="$SERVER_STORAGE_PATH/$1/$DEFAULT_PROPERTIES"
 
 	SERVER_USER="$DEFAULT_SERVER_USER"
 	SCREEN_NAME="${DEFAULT_SCREEN_NAME//\{SERVER_NAME\}/${1}}"
diff --git a/msm.conf b/msm.conf
index cf151df..4e6887c 100644
--- a/msm.conf
+++ b/msm.conf
@@ -21,7 +21,6 @@ USERNAME="minecraft"
 
 # Where new servers are stored
 SERVER_STORAGE_PATH="/opt/msm/servers"
-DEFAULT_SERVER_CONF="server.properties"
 
 # Where runnable jar files for use by servers are stored
 JAR_STORAGE_PATH="/opt/msm/jars"