remove support for old-style-groovysh as its implementation Interacti…

…veShell was deprecated and has already been removed
groovy · Sep 23, 2011 · f398118 · f398118
1 parent 3c47089
commit f398118
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/src/bin/groovysh b/src/bin/groovysh
@@ -30,8 +30,4 @@ DIRNAME=`dirname "$PRG"`
 
 . "$DIRNAME/startGroovy"
 
-if [ "x$OLDSHELL" != "x" ]; then
+startGroovy org.codehaus.groovy.tools.shell.Main "$@"
-    startGroovy groovy.ui.InteractiveShell "$@"
-else
-    startGroovy org.codehaus.groovy.tools.shell.Main "$@"
-fi
diff --git a/src/bin/groovysh.bat b/src/bin/groovysh.bat
@@ -12,8 +12,7 @@ if "%OS%"=="Windows_NT" setlocal
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.\
 
-set CLASSNAME=groovy.ui.InteractiveShell
+set CLASSNAME=org.codehaus.groovy.tools.shell.Main
-if "%OLDSHELL%" == "" set CLASSNAME=org.codehaus.groovy.tools.shell.Main
 
 "%DIRNAME%\startGroovy.bat" "%DIRNAME%" %CLASSNAME% %*