From 84b1a719f2ef35808dad424f73dc41395dfe6008 Mon Sep 17 00:00:00 2001
From: Akkadius <akkadius1@gmail.com>
Date: Sun, 23 Jul 2017 03:39:58 -0500
Subject: [PATCH] Few adjustments to maintenance script

---
 utils/scripts/eqemu_server.pl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/utils/scripts/eqemu_server.pl b/utils/scripts/eqemu_server.pl
index 92f9ce5f4..951d9ad28 100644
--- a/utils/scripts/eqemu_server.pl
+++ b/utils/scripts/eqemu_server.pl
@@ -56,6 +56,8 @@ if(-e "eqemu_config.json") {
 	read_eqemu_config_json();
 }
 else {
+	#::: This will need to stay for servers who simply haven't updated yet
+	# This script can still update without the server bins being updated
 	read_eqemu_config_xml();
 }
 get_mysql_path();
@@ -672,11 +674,7 @@ sub do_install_config_json {
 
 	$config = $json->decode($content);
 	
-	$config->{"server"}{"database"}{"username"} = $installation_variables{"mysql_eqemu_user"};
-	$config->{"server"}{"database"}{"password"} = $installation_variables{"mysql_eqemu_password"};
-	
-	$append = ' (' . generate_random_password(5) . ')';
-	$long_name = "Akkas " . $OS . " PEQ Installer " . $append;
+	$long_name = "Akkas " . $OS . " PEQ Installer (" . generate_random_password(5) . ')';
 	$config->{"server"}{"world"}{"longname"} = $long_name;
 	$config->{"server"}{"world"}{"key"} = generate_random_password(30);
 	
@@ -686,6 +684,8 @@ sub do_install_config_json {
 	else {
 		$db_name = "peq";
 	}
+	$config->{"server"}{"database"}{"username"} = $installation_variables{"mysql_eqemu_user"};
+	$config->{"server"}{"database"}{"password"} = $installation_variables{"mysql_eqemu_password"};
 	$config->{"server"}{"database"}{"db"} = $db_name;
 	
 	open(my $fh, '>', 'eqemu_config.json');