Skip to content

fixed Android Mode 4.6 Installation Issue #769

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
codeanticode merged 1 commit into from
Jul 9, 2024
Merged

fixed Android Mode 4.6 Installation Issue #769

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions processing/mode/src/processing/mode/android/AndroidSDK.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,10 +405,19 @@ static public File getGoogleDriverFolder() {
*/
private static File findCliTool(final File toolDir, String toolName)
throws BadSDKException {
File toolFile = Platform.isWindows() ? new File(toolDir, toolName + ".exe") : new File(toolDir, toolName);
if (!toolFile.exists()) {
throw new BadSDKException("Cannot find " + toolName + " in " + toolDir);
}
File toolFile;
if (Platform.isWindows()) {
toolFile = new File(toolDir, toolName + ".exe");
if (!toolFile.exists()) {
toolFile = new File(toolDir, toolName + ".bat");
}
} else {
toolFile = new File(toolDir, toolName);
}

if (!toolFile.exists()) {
throw new BadSDKException("Cannot find " + toolName + " in " + toolDir);
}

if (!Platform.isWindows()) {
try {
Expand Down