[trunk] Upgrade:

- move users.yml to users.yml.old
- handle filesystems that ignore case

git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1303 e251c2fe-e539-e718-e476-b85c1f46cddb
This commit is contained in:
snowleo 2011-05-01 22:58:54 +00:00
parent c5850ddbd1
commit 6f16650e7d

View file

@ -215,6 +215,7 @@ public class EssentialsUpgrade
} }
} }
} }
usersFile.renameTo(new File(usersFile.getAbsolutePath() + ".old"));
} }
private void convertWarps() private void convertWarps()
@ -338,19 +339,24 @@ public class EssentialsUpgrade
{ {
continue; continue;
} }
String sanitizedFilename = Util.sanitizeFileName(filename); String sanitizedFilename = Util.sanitizeFileName(filename.substring(0, filename.length() - 4)) + ".yml";
if (sanitizedFilename.equals(filename)) if (sanitizedFilename.equals(filename))
{ {
continue; continue;
} }
File tmpFile = new File(listOfFiles[i].getParentFile(), sanitizedFilename + ".tmp");
File newFile = new File(listOfFiles[i].getParentFile(), sanitizedFilename); File newFile = new File(listOfFiles[i].getParentFile(), sanitizedFilename);
if (!listOfFiles[i].renameTo(tmpFile)) {
logger.log(Level.WARNING, "Failed to move userdata/"+filename+" to userdata/"+sanitizedFilename+".tmp");
continue;
}
if (newFile.exists()) if (newFile.exists())
{ {
logger.log(Level.WARNING, "Duplicated userdata: "+filename+" and "+sanitizedFilename); logger.log(Level.WARNING, "Duplicated userdata: "+filename+" and "+sanitizedFilename);
continue; continue;
} }
if (!listOfFiles[i].renameTo(newFile)) { if (!tmpFile.renameTo(newFile)) {
logger.log(Level.WARNING, "Failed to move userdata/"+filename+" to userdata/"+sanitizedFilename); logger.log(Level.WARNING, "Failed to move userdata/"+sanitizedFilename+".tmp to userdata/"+sanitizedFilename);
} }
} }
} }