Bash cleanup #6007
Bash cleanup #6007
Conversation
Expr isn't needed since bash and sh have case statement with globbing, and expr is only checking for a dot. The else statement is unnecessary now because the case statement will fall back to ruby_args anyway. This also removes the need for the "expr --" check at the top.
Most of these changes are thanks to [shellcheck](https://www.shellcheck.net), the rest are things I saw along the way. ------------------------------------------------------------------------ * All variables are double-quoted except in the following scenarios: * It will always be either true or false, i.e. cygwin and use_exec. * Variables aren't expanded in the beginning of a case statement. * We want the variable to be split on whitespace, i.e. JRUBY_OPTS, so we can loop through it. * The command will throw an syntax error regardless of quotes on incorrect input (i.e. exit [number]) * All tests are converted from bash-specific double brackets to single brackets for ease of porting to POSIX shell. * Using -a and -o for 'and' and 'or' is defined by POSIX, but it looks ugly and shellcheck says it's not well defined, so we can chain multiple self-contained tests with the shell's builtin && and || operations. * Several tests compare a string to "" with = or !=, which can be simplified to testing the string, -s on the string, or -z on the string. * Function declaration is changed to function_name() { ... } to be more in line with POSIX * Command substitution using backticks is replaced with "$(command)". * "which [command]" is non-standard and replaced with shell builtin "command -v [command]". * Other innocuous changes: * A couple lines were indented weirdly, so I fixed them to be more consistent. * A few variables were only used once, so I replaced them with the equivalent value where they were used. Some were unused, e.g. darwin and mode.
JAVA_VM wasn't used anywhere and JRUBY_OPTS_TEMP was only used to set JAVA_VM, so I removed them both.
|
If there ends up being some esoteric platform which somehow disagrees with any of this we should land it sooner than later. |
|
I discussed with @mrnoname1000 the remaining steps for POSIX shell support and most of them boil down to leveraging sh argument arrays to replace the += bash arrays we use heavily. Historically the main trouble we had with sh was losing proper quoting when forced to reinterpolate arguments during arg processing. The other challenge is that there's no readlink in posix so we'd either have to require that (probably not a big deal) or import a non-trivial sh-based implementation of it. Thanks for the deep investigation @mrnoname1000! |
|
@headius @mrnoname1000 sounds great. Using simplest sh that is portable sounds like a dream to me :) |
| fi | ||
| fi | ||
|
|
||
| # Detect Java 9+ by the presence of a jmods directory in JAVA_HOME | ||
| if [ -d $JAVA_HOME/jmods ]; then | ||
| if [ -d "$JAVA_HOME"/jmods ]; then |
There was a problem hiding this comment.
Note: this actually fixes a warning running on Windows in a Bash shell:
/c/Users/runneradmin/.rubies/jruby-9.2.9.0/bin/jruby: line 155: [: C:\Program: binary operator expected
This happens in GitHub Actions.
There was a problem hiding this comment.
Makes sense with spaces in path.
There was a problem hiding this comment.
Yeah, exactly. Using the Bash launcher Windows is likely unusual though (Just jruby would give precedence to the .exe, only /full/path/to/jruby or jruby.bash in a Bash shell would use the Bash launcher).
Here are a bunch of changes cleaning up the Bash launcher. Most of it is assisted by shellcheck.
Changes include syntax improvements, removing unused variables, and some minimal syntax changes to make it easier to port to POSIX shell in the future.
See commit messages for more details.