Allow spaces in IDE install path on Linux #3973
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The startup bash script lacked quotes in some places, causing it to
interpret part of the path to the splash image as the main class and
fail to start:
arduino: line 29: [: /home/a/Arduino: binary operator expected
Error: Could not find or load main class IDE.lib.splash.png
For the -splash option, simply adding quotes was not sufficient. If no
splash screen was to be used (so when $SPLASH was empty), using
"$SPLASH" would result in an empty argument being passed to java, which
was then interpreted by java as the name of the base class.
To allow spaces to occur in the -splash option, but also allow it to be
omitted entirely, options to java are now passed through the
$JAVA_OPTIONS array. By using the special "${JAVA_OPTIONS[@]}" syntax,
each element in the array is expanded into a single argument, even when
spaces are present inside (this is identical to what happens with "$@").
This fixes arduino#3950
|
@ArduinoBot build this please |
| JAVA_OPTIONS+=("-splash:$APPDIR/lib/splash.png") | ||
| fi | ||
|
|
||
| $JAVA "${JAVA_OPTIONS[@]}" processing.app.Base "$@" |
There was a problem hiding this comment.
The variable JAVA can be obtained from:
JAVA=$APPDIR/java/bin/java
when the if on line 24 is followed and, since APPDIR may contain spaces, the last line should be changed to:
"$JAVA" "${JAVA_OPTIONS[@]}" processing.app.Base "$@"
(adding quotes to the $JAVA call), do you agree?
There was a problem hiding this comment.
Good catch, agreed! Will you change it?
cmaglie
added a commit
that referenced
this pull request
Oct 14, 2015
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The startup bash script lacked quotes in some places, causing it to
interpret part of the path to the splash image as the main class and
fail to start:
arduino: line 29: [: /home/a/Arduino: binary operator expected
Error: Could not find or load main class IDE.lib.splash.png
For the -splash option, simply adding quotes was not sufficient. If no
splash screen was to be used (so when $SPLASH was empty), using
"$SPLASH" would result in an empty argument being passed to java, which
was then interpreted by java as the name of the base class.
To allow spaces to occur in the -splash option, but also allow it to be
$JAVA_OPTIONS array. By using the special "$ {JAVA_OPTIONS[@]}" syntax,
omitted entirely, options to java are now passed through the
each element in the array is expanded into a single argument, even when
spaces are present inside (this is identical to what happens with "$@").
This fixes #3950