From d870b69a7317d1d203308431d28c90a47644d1c8 Mon Sep 17 00:00:00 2001 From: Stef Tervelde Date: Tue, 6 Jan 2026 14:43:38 +0100 Subject: [PATCH] Update install script to use 'processing' instead of 'processing-java' Changed references from 'processing-java' to 'processing' in the install script and related file paths for consistency and clarity. Also updated import statements for better organization. --- .../app/tools/InstallCommander.java | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/app/src/processing/app/tools/InstallCommander.java b/app/src/processing/app/tools/InstallCommander.java index 33eabc6f68..3f2eb5c92a 100644 --- a/app/src/processing/app/tools/InstallCommander.java +++ b/app/src/processing/app/tools/InstallCommander.java @@ -21,13 +21,6 @@ package processing.app.tools; -import java.io.File; -import java.io.FilenameFilter; -import java.io.IOException; -import java.io.PrintWriter; - -import javax.swing.JOptionPane; - import processing.app.Base; import processing.app.Language; import processing.app.Messages; @@ -36,6 +29,12 @@ import processing.core.PApplet; import processing.data.StringList; +import javax.swing.*; +import java.io.File; +import java.io.FilenameFilter; +import java.io.IOException; +import java.io.PrintWriter; + public class InstallCommander implements Tool { Base base; @@ -92,7 +91,7 @@ public void run() { var appBinary = (resourcesDir .split("\\.app")[0] + ".app/Contents/MacOS/Processing") .replaceAll(" ", "\\\\ "); - writer.print(appBinary + " cli $@"); + writer.print(appBinary + " $@"); } else { // Ant based distributable @@ -130,7 +129,7 @@ public void run() { // 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 targetPath = "/usr/local/bin/processing"; // Remove the old version in case it exists // https://github.com/processing/processing/issues/3786 String oldPath = "/usr/bin/processing-java"; @@ -142,11 +141,11 @@ public void run() { PApplet.exec(new String[] { "osascript", "-e", appleScript }); } else if (result == JOptionPane.NO_OPTION) { - File targetFile = new File(System.getProperty("user.home"), "processing-java"); + File targetFile = new File(System.getProperty("user.home"), "processing"); String targetPath = targetFile.getAbsolutePath(); if (targetFile.exists()) { Messages.showWarning("File Already Exists", - "The processing-java program already exists at:\n" + + "The processing program already exists at:\n" + targetPath + "\n" + "Please remove it and try again."); } else {