Fix linux installs [skip ci]

This commit is contained in:
Akkadius 2016-09-06 22:36:50 -05:00
parent bf28354301
commit 90dc7a4e38
2 changed files with 4 additions and 4 deletions

View File

@ -196,13 +196,13 @@ sub new_server {
}
closedir(DIR);
if($file_count > 1 && !-e "install_variables.txt"){
if($file_count > 1 && (!-e "install_variables.txt" || !-e "../install_variables.txt")){
print "[New Server] ERROR: You must run eqemu_server.pl in an empty directory\n";
<>;
exit;
}
if(-e "install_variables.txt"){
if(-e "install_variables.txt" || -e "../install_variables.txt"){
get_installation_variables();
}
@ -2153,4 +2153,4 @@ sub generate_random_password {
map $alphanumeric[rand @alphanumeric], 0..$passwordsize;
return $randpassword;
}
}

View File

@ -205,7 +205,7 @@ make
#::: Back to server directory
cd $eqemu_server_directory/server
wget https://dl.dropboxusercontent.com/u/50023467/dl/eqemu/eqemu_server.pl
wget https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/eqemu_server.pl
#::: Link build files