Skip to content

Commit 29fe5ec

Browse files
nicksiegernicksieger
committed
JRUBY-1961: ignore pre-existing JRUBY_HOME in environment
- clean up scripts, also nuke any mention of JRUBY_BASE/jruby.base git-svn-id: http://svn.codehaus.org/jruby/trunk/jruby@6253 961051c9-f516-0410-bf72-c9f7e237a7b7
1 parent 49aba52 commit 29fe5ec

21 files changed

Lines changed: 67 additions & 311 deletions

‎bin/_jrubycleanup.bat‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
rem ----- Restore Environment Variables ---------------------------------------
44

55
:cleanup
6-
set JRUBY_BASE=%_JRUBY_BASE%
7-
set _JRUBY_BASE=
8-
set JRUBY_HOME=%_JRUBY_HOME%
9-
set _JRUBY_HOME=
106
set CLASSPATH=%_CLASSPATH%
117
set _CLASSPATH=
128
set CP=%_CP%

‎bin/_jrubyvars.bat‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,13 @@
11
@echo off
22
rem Environment Variable Prequisites:
33
rem
4-
rem JRUBY_BASE (Optional) Base directory for resolving dynamic portions
5-
rem of a JRuby installation. If not present, resolves to
6-
rem the same directory that JRUBY_HOME points to.
7-
rem
8-
rem JRUBY_HOME (Optional) May point at your JRuby "build" directory.
9-
rem If not present, the current working directory is assumed.
10-
rem
114
rem JRUBY_OPTS (Optional) Default JRuby command line args.
125
rem
136
rem JAVA_HOME Must point at your Java Development Kit installation.
147
rem
158

169
rem ----- Save Environment Variables That May Change --------------------------
1710

18-
set _JRUBY_BASE=%JRUBY_BASE%
19-
set _JRUBY_HOME=%JRUBY_HOME%
2011
set _CLASSPATH=%CLASSPATH%
2112
set _CP=%CP%
2213

@@ -28,14 +19,7 @@ echo You must set JAVA_HOME to point at your Java Development Kit installation
2819
goto cleanup
2920
:gotJava
3021

31-
if not "%JRUBY_HOME%" == "" goto gotHome
3222
set JRUBY_HOME=%~dp0..
33-
:gotHome
34-
35-
if not "%JRUBY_BASE%" == "" goto gotBase
36-
set JRUBY_BASE=%JRUBY_HOME%
37-
:gotBase
38-
3923

4024
rem ----- Prepare Appropriate Java Execution Commands -------------------------
4125

@@ -81,9 +65,3 @@ goto :EOF
8165
set CP=%CP%;%*
8266

8367
goto :EOF
84-
85-
rem echo Using JRUBY_BASE: %JRUBY_BASE%
86-
rem echo Using JRUBY_HOME: %JRUBY_HOME%
87-
rem echo Using CLASSPATH: %CLASSPATH%
88-
rem echo Using JAVA_HOME: %JAVA_HOME%
89-
rem echo Using Args: %*

‎bin/gem.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ rem ---------------------------------------------------------------------------
44

55
call "%~dp0_jrubyvars" %*
66

7-
"%_STARTJAVA%" %_VM_OPTS% -cp "%CLASSPATH%" -Djruby.base="%JRUBY_BASE%" -Djruby.home="%JRUBY_HOME%" -Djruby.lib="%JRUBY_HOME%\lib" -Djruby.shell="cmd.exe" -Djruby.script=jruby.bat org.jruby.Main %JRUBY_OPTS% "%JRUBY_HOME%\bin\gem" %_RUBY_OPTS%
7+
"%_STARTJAVA%" %_VM_OPTS% -cp "%CLASSPATH%" -Djruby.home="%JRUBY_HOME%" -Djruby.lib="%JRUBY_HOME%\lib" -Djruby.shell="cmd.exe" -Djruby.script=jruby.bat org.jruby.Main %JRUBY_OPTS% "%JRUBY_HOME%\bin\gem" %_RUBY_OPTS%
88
set E=%ERRORLEVEL%
99

1010
call "%~dp0_jrubycleanup"

‎bin/gem_mirror.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ setlocal
33
rem ---------------------------------------------------------------------------
44
call "%~dp0_jrubyvars" %*
55

6-
"%_STARTJAVA%" %_VM_OPTS% -cp "%CLASSPATH%" -Djruby.base="%JRUBY_BASE%" -Djruby.home="%JRUBY_HOME%" -Djruby.lib="%JRUBY_HOME%\lib" -Djruby.shell="cmd.exe" -Djruby.script=jruby.bat org.jruby.Main %JRUBY_OPTS% "%JRUBY_HOME%\bin\gem_mirror" %_RUBY_OPTS%
6+
"%_STARTJAVA%" %_VM_OPTS% -cp "%CLASSPATH%" -Djruby.home="%JRUBY_HOME%" -Djruby.lib="%JRUBY_HOME%\lib" -Djruby.shell="cmd.exe" -Djruby.script=jruby.bat org.jruby.Main %JRUBY_OPTS% "%JRUBY_HOME%\bin\gem_mirror" %_RUBY_OPTS%
77
set E=%ERRORLEVEL%
88

99
call "%~dp0_jrubycleanup"

‎bin/gem_server.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ rem ---------------------------------------------------------------------------
44

55
call "%~dp0_jrubyvars" %*
66

7-
"%_STARTJAVA%" %_VM_OPTS% -cp "%CLASSPATH%" -Djruby.base="%JRUBY_BASE%" -Djruby.home="%JRUBY_HOME%" -Djruby.lib="%JRUBY_HOME%\lib" -Djruby.shell="cmd.exe" -Djruby.script=jruby.bat org.jruby.Main %JRUBY_OPTS% "%JRUBY_HOME%\bin\gem_server" %_RUBY_OPTS%
7+
"%_STARTJAVA%" %_VM_OPTS% -cp "%CLASSPATH%" -Djruby.home="%JRUBY_HOME%" -Djruby.lib="%JRUBY_HOME%\lib" -Djruby.shell="cmd.exe" -Djruby.script=jruby.bat org.jruby.Main %JRUBY_OPTS% "%JRUBY_HOME%\bin\gem_server" %_RUBY_OPTS%
88
set E=%ERRORLEVEL%
99

1010
call "%~dp0_jrubycleanup"

‎bin/gemwhich.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ rem ---------------------------------------------------------------------------
44

55
call "%~dp0_jrubyvars" %*
66

7-
"%_STARTJAVA%" %_VM_OPTS% -cp "%CLASSPATH%" -Djruby.base="%JRUBY_BASE%" -Djruby.home="%JRUBY_HOME%" -Djruby.lib="%JRUBY_HOME%\lib" -Djruby.shell="cmd.exe" -Djruby.script=jruby.bat org.jruby.Main %JRUBY_OPTS% "%JRUBY_HOME%\bin\gemwhich" %_RUBY_OPTS%
7+
"%_STARTJAVA%" %_VM_OPTS% -cp "%CLASSPATH%" -Djruby.home="%JRUBY_HOME%" -Djruby.lib="%JRUBY_HOME%\lib" -Djruby.shell="cmd.exe" -Djruby.script=jruby.bat org.jruby.Main %JRUBY_OPTS% "%JRUBY_HOME%\bin\gemwhich" %_RUBY_OPTS%
88
set E=%ERRORLEVEL%
99

1010
call "%~dp0_jrubycleanup"

‎bin/jirb.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ rem
66
setlocal
77
call "%~dp0_jrubyvars" %*
88

9-
"%_STARTJAVA%" %_VM_OPTS% -cp "%CLASSPATH%" -Djruby.base="%JRUBY_BASE%" -Djruby.home="%JRUBY_HOME%" -Djruby.lib="%JRUBY_HOME%\lib" -Djruby.shell="cmd.exe" -Djruby.script=jruby.bat org.jruby.Main %JRUBY_OPTS% "%JRUBY_HOME%\bin\jirb" %_RUBY_OPTS%
9+
"%_STARTJAVA%" %_VM_OPTS% -cp "%CLASSPATH%" -Djruby.home="%JRUBY_HOME%" -Djruby.lib="%JRUBY_HOME%\lib" -Djruby.shell="cmd.exe" -Djruby.script=jruby.bat org.jruby.Main %JRUBY_OPTS% "%JRUBY_HOME%\bin\jirb" %_RUBY_OPTS%
1010
set E=%ERRORLEVEL%
1111

1212
call "%~dp0_jrubycleanup"

‎bin/jirb_swing.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ rem ---------------------------------------------------------------------------
44
setlocal
55
call "%~dp0_jrubyvars" %*
66

7-
"%_STARTJAVA%" %_VM_OPTS% -cp "%CLASSPATH%" -Djruby.base="%JRUBY_BASE%" -Djruby.home="%JRUBY_HOME%" -Djruby.lib="%JRUBY_HOME%\lib" -Djruby.shell="cmd.exe" -Djruby.script=jruby.bat org.jruby.Main %JRUBY_OPTS% "%JRUBY_HOME%\bin\jirb_swing" %_RUBY_OPTS%
7+
"%_STARTJAVA%" %_VM_OPTS% -cp "%CLASSPATH%" -Djruby.home="%JRUBY_HOME%" -Djruby.lib="%JRUBY_HOME%\lib" -Djruby.shell="cmd.exe" -Djruby.script=jruby.bat org.jruby.Main %JRUBY_OPTS% "%JRUBY_HOME%\bin\jirb_swing" %_RUBY_OPTS%
88
set E=%ERRORLEVEL%
99

1010
call "%~dp0_jrubycleanup"

‎bin/jruby‎

Lines changed: 19 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,6 @@
44
#
55
# Environment Variable Prequisites
66
#
7-
# JRUBY_BASE (Optional) Base directory for resolving dynamic portions
8-
# of a JRuby installation. If not present, resolves to
9-
# the same directory that JRUBY_HOME points to.
10-
#
11-
# JRUBY_HOME (Optional) May point at your JRuby "build" directory.
12-
# If not present, the current working directory is assumed.
13-
#
147
# JRUBY_OPTS (Optional) Default JRuby command line args
158
# JRUBY_SHELL Where/What is system shell
169
#
@@ -27,31 +20,22 @@ esac
2720

2821
# ----- Verify and Set Required Environment Variables -------------------------
2922

30-
if [ -z "$JRUBY_HOME" ] ; then
31-
## resolve links - $0 may be a link to home
32-
PRG=$0
33-
progname=`basename "$0"`
34-
35-
while [ -h "$PRG" ] ; do
36-
ls=`ls -ld "$PRG"`
37-
link=`expr "$ls" : '.*-> \(.*\)$'`
38-
if expr "$link" : '.*/.*' > /dev/null; then
39-
PRG="$link"
40-
else
41-
PRG="`dirname $PRG`/$link"
42-
fi
43-
done
44-
45-
JRUBY_HOME_1=`dirname "$PRG"` # the ./bin dir
46-
JRUBY_HOME_1=`dirname "$JRUBY_HOME_1"` # the . dir
47-
if [ -d "${JRUBY_HOME_1}/lib" ] ; then
48-
JRUBY_HOME="${JRUBY_HOME_1}"
49-
fi
50-
else
51-
if $cygwin; then
52-
JRUBY_HOME=`cygpath -u "$JRUBY_HOME"`
23+
## resolve links - $0 may be a link to home
24+
PRG=$0
25+
progname=`basename "$0"`
26+
27+
while [ -h "$PRG" ] ; do
28+
ls=`ls -ld "$PRG"`
29+
link=`expr "$ls" : '.*-> \(.*\)$'`
30+
if expr "$link" : '.*/.*' > /dev/null; then
31+
PRG="$link"
32+
else
33+
PRG="`dirname $PRG`/$link"
5334
fi
54-
fi
35+
done
36+
37+
JRUBY_HOME_1=`dirname "$PRG"` # the ./bin dir
38+
JRUBY_HOME=`dirname "$JRUBY_HOME_1"` # the . dir
5539

5640
if [ -z "$JRUBY_OPTS" ] ; then
5741
JRUBY_OPTS=""
@@ -99,15 +83,8 @@ else
9983
fi
10084
fi
10185

102-
# ----- Set Up JRUBY_BASE If Necessary -------------------------------------
103-
104-
if [ -z "$JRUBY_BASE" ] ; then
105-
JRUBY_BASE="$JRUBY_HOME"
106-
fi
107-
10886
# ----- Execute The Requested Command -----------------------------------------
10987

110-
11188
JAVA_MEM=-Xmx378m
11289
JAVA_STACK=-Xss1024k
11390

@@ -153,7 +130,6 @@ JAVA_OPTS="$JAVA_OPTS ${java_args[@]} $JAVA_MEM $JAVA_STACK"
153130

154131
if $cygwin; then
155132
JAVA_HOME=`cygpath --mixed "$JAVA_HOME"`
156-
JRUBY_BASE=`cygpath --mixed "$JRUBY_BASE"`
157133
JRUBY_HOME=`cygpath --mixed "$JRUBY_HOME"`
158134
JRUBY_SHELL=`cygpath --mixed "$JRUBY_SHELL"`
159135

@@ -165,9 +141,8 @@ if $cygwin; then
165141
fi
166142
fi
167143

168-
exec "$JAVA_CMD" $JAVA_OPTS -classpath "$CP" \
169-
"-Djruby.base=$JRUBY_BASE" "-Djruby.home=$JRUBY_HOME" \
170-
"-Djruby.lib=$JRUBY_BASE/lib" -Djruby.script=jruby \
171-
"-Djruby.shell=$JRUBY_SHELL" \
144+
exec "$JAVA_CMD" $JAVA_OPTS -classpath "$CP" \
145+
"-Djruby.home=$JRUBY_HOME" \
146+
"-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \
147+
"-Djruby.shell=$JRUBY_SHELL" \
172148
org.jruby.Main $JRUBY_OPTS "$@"
173-

‎bin/jruby-ng‎

Lines changed: 16 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
# -----------------------------------------------------------------------------
33
# jruby-ng - Start Script for the JRuby interpreter, using NailGun
44
#
5-
# JRUBY_HOME (Optional) May point at your JRuby "build" directory.
6-
# If not present, the current working directory is assumed.
7-
#
85
# -----------------------------------------------------------------------------
96

107
cygwin=false
@@ -16,45 +13,31 @@ esac
1613

1714
# ----- Verify and Set Required Environment Variables -------------------------
1815

19-
if [ -z "$JRUBY_HOME" ] ; then
20-
## resolve links - $0 may be a link to home
21-
PRG=$0
22-
progname=`basename "$0"`
23-
24-
while [ -h "$PRG" ] ; do
25-
ls=`ls -ld "$PRG"`
26-
link=`expr "$ls" : '.*-> \(.*\)$'`
27-
if expr "$link" : '.*/.*' > /dev/null; then
28-
PRG="$link"
29-
else
30-
PRG="`dirname $PRG`/$link"
31-
fi
32-
done
33-
34-
JRUBY_HOME_1=`dirname "$PRG"` # the ./bin dir
35-
JRUBY_HOME_1=`dirname "$JRUBY_HOME_1"` # the . dir
36-
if [ -d "${JRUBY_HOME_1}/lib" ] ; then
37-
JRUBY_HOME="${JRUBY_HOME_1}"
38-
fi
39-
else
40-
if $cygwin; then
41-
JRUBY_HOME=`cygpath -u "$JRUBY_HOME"`
16+
## resolve links - $0 may be a link to home
17+
PRG=$0
18+
progname=`basename "$0"`
19+
20+
while [ -h "$PRG" ] ; do
21+
ls=`ls -ld "$PRG"`
22+
link=`expr "$ls" : '.*-> \(.*\)$'`
23+
if expr "$link" : '.*/.*' > /dev/null; then
24+
PRG="$link"
25+
else
26+
PRG="`dirname $PRG`/$link"
4227
fi
43-
fi
44-
45-
# ----- Set Up JRUBY_BASE If Necessary -------------------------------------
28+
done
4629

47-
if [ -z "$JRUBY_BASE" ] ; then
48-
JRUBY_BASE="$JRUBY_HOME"
30+
JRUBY_HOME_1=`dirname "$PRG"` # the ./bin dir
31+
JRUBY_HOME_1=`dirname "$JRUBY_HOME_1"` # the . dir
32+
if [ -d "${JRUBY_HOME_1}/lib" ] ; then
33+
JRUBY_HOME="${JRUBY_HOME_1}"
4934
fi
5035

5136
# ----- Execute The Requested Command -----------------------------------------
5237

5338
if $cygwin; then
5439
JAVA_HOME=`cygpath --mixed "$JAVA_HOME"`
55-
JRUBY_BASE=`cygpath --mixed "$JRUBY_BASE"`
5640
JRUBY_HOME=`cygpath --mixed "$JRUBY_HOME"`
57-
JRUBY_SHELL=`cygpath --mixed "$JRUBY_SHELL"`
5841
fi
5942

6043
exec $JRUBY_HOME/tool/nailgun/ng org.jruby.util.NailMain $JRUBY_OPTS "$@"

0 commit comments

Comments
 (0)