move processing-java to /usr/local/bin (fixes processing#3497)

benfry · benfry · commit 7f67c29f52e7 · 2015-08-17T17:11:19.000-04:00
diff --git a/app/src/processing/app/tools/InstallCommander.java b/app/src/processing/app/tools/InstallCommander.java
@@ -102,8 +102,11 @@ public void run() {
       String sourcePath = file.getAbsolutePath();
 
       if (result == JOptionPane.YES_OPTION) {
-        String targetPath = "/usr/bin/processing-java";
-        String shellScript = "/bin/mv " + sourcePath + " " + targetPath;
+        // Moving to /usr/local/bin instead of /usr/bin for compatibility
+        // with OS X 10.11 and its "System Integrity Protection"
+        // https://github.com/processing/processing/issues/3497
+        String targetPath = "/usr/local/bin/processing-java";
+        String shellScript = "/bin/mkdir -p /usr/local/bin && /bin/mv " + sourcePath + " " + targetPath;
         String appleScript =
           "do shell script \"" + shellScript + "\" with administrator privileges";
         PApplet.exec(new String[] { "osascript", "-e", appleScript });
diff --git a/java/src/processing/mode/java/Commander.java b/java/src/processing/mode/java/Commander.java
@@ -386,6 +386,7 @@ static void printCommandLine(PrintStream out) {
 //    out.println("                     32- or 64-bit specific such as the OpenGL library.");
 //    out.println("                     Otherwise specify 0 or leave it out.");
 
+    out.println();
     out.println("The --build, --run, --present, or --export will be the final parameter");
     out.println("passed to Processing. Arguments passed following one of those four will");
     out.println("be passed through to the sketch itself, and therefore available to the");
diff --git a/todo.txt b/todo.txt
@@ -1,6 +1,12 @@
 0243 (3.0b5)
 
 
+earlier
+X modify build to insert these after antlr run:
+X   @SuppressWarnings({"unused", "cast"})
+X   or get the updated ANTLR, which likely would support it
+
+
 known issues
 _ launch4j doesn't work from folders with non-native charsets
 _   anything in CP1252 on an English Windows system is fine
@@ -34,6 +40,8 @@ _   probably have to add the script/Processing.app location to user's path
 _   move processing-java inside the Java Mode? 
 _   make a Tool that installs it for all platforms, not just OS X
 _   not really part of the 'build' anymore
+_ sketch modified externally with FAT32 volumes on OS X
+_   https://github.com/processing/processing/issues/3387
 
 
 gui
@@ -447,9 +455,6 @@ _   https://github.com/fjenett/processing-preprocessor-antlr4
 _   https://github.com/processing/processing/issues/3055
 _ update grammar for ANTLR
 _   https://github.com/processing/processing/issues/3054
-_ modify build to insert these after antlr run:
-_   @SuppressWarnings({"unused", "cast"})
-_   or get the updated ANTLR, which likely would support it
 _ omitting a semicolon shows the error on the line after it
 _ npe if library is removed before compile
 _   always check library folders to make sure they're still valid
