rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-11-29 10:24:12 +01:00
Code Issues Releases Activity

Copying bundled signature file if missing from user's preferences folder

Browse Source
This commit is contained in:
Federico Fissore 2015-04-30 11:23:01 +02:00
parent cf1879f948
commit 1f1f5b5c0e
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arduino-core/src/processing/app/BaseNoGui.java
View File

@ -582,7 +582,6 @@ public class BaseNoGui {
File defaultPackageJsonFile = new File(getContentFile("dist"), "package_index.json"); File defaultPackageJsonFile = new File(getContentFile("dist"), "package_index.json");
if (!indexFile.isFile() || (defaultPackageJsonFile.isFile() && defaultPackageJsonFile.lastModified() > indexFile.lastModified())) { if (!indexFile.isFile() || (defaultPackageJsonFile.isFile() && defaultPackageJsonFile.lastModified() > indexFile.lastModified())) {
FileUtils.copyFile(defaultPackageJsonFile, indexFile); FileUtils.copyFile(defaultPackageJsonFile, indexFile);
FileUtils.copyFile(new File(getContentFile("dist"), "package_index.json.sig"), new File(indexFile.getParent(), "package_index.json.sig"));
} else if (!indexFile.isFile()) { } else if (!indexFile.isFile()) {
// Otherwise create an empty packages index // Otherwise create an empty packages index
FileOutputStream out = null; FileOutputStream out = null;
@ -597,10 +596,17 @@ public class BaseNoGui {
} }
} }
File indexSignatureFile = indexer.getIndexFile("package_index.json.sig");
File defaultPackageJsonSignatureFile = new File(getContentFile("dist"), "package_index.json.sig");
if (!indexSignatureFile.isFile() || (defaultPackageJsonSignatureFile.isFile() && defaultPackageJsonSignatureFile.lastModified() > indexSignatureFile.lastModified())) {
FileUtils.copyFile(defaultPackageJsonSignatureFile, indexSignatureFile);
}
try { try {
indexer.parseIndex(); indexer.parseIndex();
} catch (SignatureVerificationFailedException e) { } catch (SignatureVerificationFailedException e) {
indexFile.delete(); indexFile.delete();
indexSignatureFile.delete();
throw e; throw e;
} }
indexer.syncWithFilesystem(getHardwareFolder()); indexer.syncWithFilesystem(getHardwareFolder());