ArchiveExtractor was not making symlinks the right way

Author: Federico Fissore

arduino-core/src/cc/arduino/utils/ArchiveExtractor.java

@@ -112,7 +112,7 @@ public void extract(File archiveFile, File destFolder, int stripPath, boolean ov
 
       Map<File, File> hardLinks = new HashMap<File, File>();
       Map<File, Integer> hardLinksMode = new HashMap<File, Integer>();
-      Map<File, File> symLinks = new HashMap<File, File>();
+      Map<File, String> symLinks = new HashMap<File, String>();
       Map<File, Long> symLinksModifiedTimes = new HashMap<File, Long>();
 
       // Cycle through all the archive entries
@@ -227,7 +227,7 @@ public void extract(File archiveFile, File destFolder, int stripPath, boolean ov
           hardLinks.put(outputFile, outputLinkedFile);
           hardLinksMode.put(outputFile, mode);
         } else if (isSymLink) {
-          symLinks.put(outputFile, outputLinkedFile);
+          symLinks.put(outputFile, linkName);
           symLinksModifiedTimes.put(outputFile, modifiedTime);
         } else {
           // Create the containing folder if not exists
@@ -255,7 +255,7 @@ public void extract(File archiveFile, File destFolder, int stripPath, boolean ov
         }
       }
 
-      for (Map.Entry<File, File> entry : symLinks.entrySet()) {
+      for (Map.Entry<File, String> entry : symLinks.entrySet()) {
         if (entry.getKey().exists() && overwrite) {
           entry.getKey().delete();
         }

arduino-core/src/processing/app/Platform.java

@@ -216,8 +216,8 @@ public String getOsArch() {
     return System.getProperty("os.arch");
   }
 
-  public void symlink(File something, File somewhere) throws IOException, InterruptedException {
-    Process process = Runtime.getRuntime().exec(new String[]{"ln", "-s", something.getAbsolutePath(), somewhere.getAbsolutePath()}, null, null);
+  public void symlink(String something, File somewhere) throws IOException, InterruptedException {
+    Process process = Runtime.getRuntime().exec(new String[]{"ln", "-s", something, somewhere.getAbsolutePath()}, null, somewhere.getParentFile());
     process.waitFor();
   }