Fix for JRUBY-3458: JAVA_HOME got converted to Unix style path on Cygwin · MSNexploder/jruby@5ce64f9 · GitHub

MSNexploder / jruby Public

forked from jruby/jruby

• Notifications You must be signed in to change notification settings
• Fork 0
• Star 0

• Code
• Pull requests
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Additional navigation options

Commit 5ce64f9

Browse filesBrowse the repository at this point in the historyBrowse files

headius

committed

Fix for JRUBY-3458: JAVA_HOME got converted to Unix style path on Cygwin

Thanks to Adam Brewster for the patch.

1 parent 9e39833 commit 5ce64f9
Copy full SHA for 5ce64f9

1 file changed

+6-4Lines changed: 6 additions & 4 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• bin
  • jruby.bash

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎bin/jruby.bash‎

Copy file name to clipboardExpand all lines: bin/jruby.bash

+6-4Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
@@ -82,9 +82,10 @@ if [ -z "$JAVA_HOME" ] ; then
82	82	JAVA_CMD='java'
83	83	else
84	84	if $cygwin; then
85		- JAVA_HOME=`cygpath -u "$JAVA_HOME"`
	85	+ JAVA_CMD="`cygpath -u "$JAVA_HOME"`/bin/java"
	86	+ else
	87	+ JAVA_CMD="$JAVA_HOME/bin/java"
86	88	fi
87		- JAVA_CMD="$JAVA_HOME/bin/java"
88	89	fi
89	90
90	91	if [ -z "$JAVA_MEM" ] ; then
@@ -248,9 +249,10 @@ do
248	249	JAVA_CMD='jdb'
249	250	else
250	251	if $cygwin; then
251		- JAVA_HOME=`cygpath -u "$JAVA_HOME"`
	252	+ JAVA_CMD="`cygpath -u "$JAVA_HOME"`/bin/jdb"
	253	+ else
	254	+ JAVA_CMD="$JAVA_HOME/bin/jdb"
252	255	fi
253		- JAVA_CMD="$JAVA_HOME/bin/jdb"
254	256	fi
255	257	java_args=("${java_args[@]}" "-sourcepath" "$JRUBY_HOME/lib/ruby/1.8:.")
256	258	JRUBY_OPTS=("${JRUBY_OPTS[@]}" "-X+C") ;;

0 commit comments

Comments

0 (0)