From b8b1dc23278f4614464861676b0c1ee7c6cd63bb Mon Sep 17 00:00:00 2001
From: Federico Fissore <f.fissore@arduino.cc>
Date: Mon, 29 Jun 2015 09:33:34 +0200
Subject: [PATCH] Dropping --curdir CLI argument support

---
 arduino-core/src/processing/app/BaseNoGui.java             | 5 -----
 .../src/processing/app/helpers/CommandlineParser.java      | 7 ++-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/arduino-core/src/processing/app/BaseNoGui.java b/arduino-core/src/processing/app/BaseNoGui.java
index 923123299..6dbba24a0 100644
--- a/arduino-core/src/processing/app/BaseNoGui.java
+++ b/arduino-core/src/processing/app/BaseNoGui.java
@@ -963,11 +963,6 @@ public class BaseNoGui {
         preferencesFile = args[i];
         continue;
       }
-      if (args[i].equals("--curdir")) {
-        i++;
-        currentDirectory = args[i];
-        continue;
-      }
     }
 
     // run static initialization that grabs all the prefs
diff --git a/arduino-core/src/processing/app/helpers/CommandlineParser.java b/arduino-core/src/processing/app/helpers/CommandlineParser.java
index 04805ec3e..e4a23fece 100644
--- a/arduino-core/src/processing/app/helpers/CommandlineParser.java
+++ b/arduino-core/src/processing/app/helpers/CommandlineParser.java
@@ -146,11 +146,8 @@ public class CommandlineParser {
         continue;
       }
       if (args[i].equals("--curdir")) {
-        i++;
-        if (i >= args.length)
-          BaseNoGui.showError(null, _("Argument required for --curdir"), 3);
-        // Argument should be already processed by Base.main(...)
-        continue;
+        BaseNoGui.showError(null, _("--curdir no longer supported"), 3);
+        return;
       }
       if (args[i].equals("--buildpath")) {
         i++;