pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-14 03:11:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix linux installs [skip ci]

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
utils/scripts/eqemu_server.pl
View File

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

2
utils/scripts/linux_installer/install.sh
View File

@ -205,7 +205,7 @@ make
#::: Back to server directory #::: Back to server directory
cd $eqemu_server_directory/server 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 #::: Link build files