From 1fcd6ff1cedf64999432d4a86194669b65e62c04 Mon Sep 17 00:00:00 2001
From: Federico Fissore <f.fissore@arduino.cc>
Date: Mon, 30 Mar 2015 17:12:38 +0200
Subject: [PATCH] ArchiveExtractor was not making symlinks the right way

---
 arduino-core/src/cc/arduino/utils/ArchiveExtractor.java | 6 +++---
 arduino-core/src/processing/app/Platform.java           | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arduino-core/src/cc/arduino/utils/ArchiveExtractor.java b/arduino-core/src/cc/arduino/utils/ArchiveExtractor.java
index d8d1c1b07..8e4ed800d 100644
--- a/arduino-core/src/cc/arduino/utils/ArchiveExtractor.java
+++ b/arduino-core/src/cc/arduino/utils/ArchiveExtractor.java
@@ -112,7 +112,7 @@ public class ArchiveExtractor {
 
       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 class ArchiveExtractor {
           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 class ArchiveExtractor {
         }
       }
 
-      for (Map.Entry<File, File> entry : symLinks.entrySet()) {
+      for (Map.Entry<File, String> entry : symLinks.entrySet()) {
         if (entry.getKey().exists() && overwrite) {
           entry.getKey().delete();
         }
diff --git a/arduino-core/src/processing/app/Platform.java b/arduino-core/src/processing/app/Platform.java
index 6a03bb4d3..cd80790a9 100644
--- a/arduino-core/src/processing/app/Platform.java
+++ b/arduino-core/src/processing/app/Platform.java
@@ -216,8 +216,8 @@ public class Platform {
     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();
   }