Load scriptFile from filesystem first #13
Merged
Conversation
This file contains 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
If scriptFile is available on the filesystem load from there. If not, fall back to loading from the jar. This restores the original, and intended behavior of the plugin.
| @@ -163,7 +163,15 @@ private void makeExecutable(File file) | |||
|
|
|||
| if (scriptFile == null) { | |||
| out.write(("#!/bin/sh\n\nexec java " + flags + " -jar \"$0\" \"$@\"\n\n").getBytes("ASCII")); | |||
| } else { | |||
| } | |||
| else if (Files.exists(Paths.get((scriptFile)))) { | |||
There was a problem hiding this comment.
You have an extra pair of () here.
There was a problem hiding this comment.
Yep, just pushed the removal of said parens!
brianm
added a commit
that referenced
this pull request
Apr 20, 2015
Load scriptFile from filesystem first
|
Merged, releasing. |
|
Released 1.4.1 to oss.s.o |
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.
If scriptFile is available on the filesystem load from there. If not, fall back to loading from the jar. This restores the original, and intended behavior of the plugin. Fixes #12