diff --git a/utils/scripts/eqemu_server.pl b/utils/scripts/eqemu_server.pl index 0cf23b9cb..4e98c1fbd 100644 --- a/utils/scripts/eqemu_server.pl +++ b/utils/scripts/eqemu_server.pl @@ -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; -} +} \ No newline at end of file diff --git a/utils/scripts/linux_installer/install.sh b/utils/scripts/linux_installer/install.sh index d9cdc0485..5b8fb24aa 100644 --- a/utils/scripts/linux_installer/install.sh +++ b/utils/scripts/linux_installer/install.sh @@ -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