Merge branch 'master' into eqemu_config_json

This commit is contained in:
Akkadius
2017-07-23 00:55:06 -05:00
23 changed files with 124 additions and 98 deletions
+3 -2
View File
@@ -1454,7 +1454,7 @@ sub map_files_fetch_bulk{
get_remote_file("http://github.com/Akkadius/EQEmuMaps/archive/master.zip", "maps/maps.zip", 1);
unzip('maps/maps.zip', 'maps/');
my @files;
my $start_dir = "maps/EQEmuMaps-master/maps";
my $start_dir = "maps/EQEmuMaps-master/";
find(
sub { push @files, $File::Find::name unless -d; },
$start_dir
@@ -2179,4 +2179,5 @@ sub generate_random_password {
map $alphanumeric[rand @alphanumeric], 0..$passwordsize;
return $randpassword;
}
}