2121
2222package processing .app .tools ;
2323
24- import java .io .File ;
25- import java .io .FilenameFilter ;
26- import java .io .IOException ;
27- import java .io .PrintWriter ;
28-
29- import javax .swing .JOptionPane ;
30-
3124import processing .app .Base ;
3225import processing .app .Language ;
3326import processing .app .Messages ;
3629import processing .core .PApplet ;
3730import processing .data .StringList ;
3831
32+ import javax .swing .*;
33+ import java .io .File ;
34+ import java .io .FilenameFilter ;
35+ import java .io .IOException ;
36+ import java .io .PrintWriter ;
37+
3938
4039public class InstallCommander implements Tool {
4140 Base base ;
@@ -92,7 +91,7 @@ public void run() {
9291 var appBinary = (resourcesDir
9392 .split ("\\ .app" )[0 ] + ".app/Contents/MacOS/Processing" )
9493 .replaceAll (" " , "\\ \\ " );
95- writer .print (appBinary + " cli $@" );
94+ writer .print (appBinary + " $@" );
9695
9796 } else {
9897 // Ant based distributable
@@ -130,7 +129,7 @@ public void run() {
130129 // Moving to /usr/local/bin instead of /usr/bin for compatibility
131130 // with OS X 10.11 and its "System Integrity Protection"
132131 // https://github.com/processing/processing/issues/3497
133- String targetPath = "/usr/local/bin/processing-java " ;
132+ String targetPath = "/usr/local/bin/processing" ;
134133 // Remove the old version in case it exists
135134 // https://github.com/processing/processing/issues/3786
136135 String oldPath = "/usr/bin/processing-java" ;
@@ -142,11 +141,11 @@ public void run() {
142141 PApplet .exec (new String [] { "osascript" , "-e" , appleScript });
143142
144143 } else if (result == JOptionPane .NO_OPTION ) {
145- File targetFile = new File (System .getProperty ("user.home" ), "processing-java " );
144+ File targetFile = new File (System .getProperty ("user.home" ), "processing" );
146145 String targetPath = targetFile .getAbsolutePath ();
147146 if (targetFile .exists ()) {
148147 Messages .showWarning ("File Already Exists" ,
149- "The processing-java program already exists at:\n " +
148+ "The processing program already exists at:\n " +
150149 targetPath + "\n " +
151150 "Please remove it and try again." );
152151 } else {
0 commit comments