You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2010/04/22 23:38:52 UTC
svn commit: r937074 - in
/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin:
deploy geronimo
Author: gawor
Date: Thu Apr 22 21:38:51 2010
New Revision: 937074
URL: http://svn.apache.org/viewvc?rev=937074&view=rev
Log:
GERONIMO-5213: Put in hacks to reset tty
Modified:
geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/deploy
geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo
Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/deploy
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/deploy?rev=937074&r1=937073&r2=937074&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/deploy (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/deploy Thu Apr 22 21:38:51 2010
@@ -194,7 +194,7 @@ if [ "$GERONIMO_ENV_INFO" != "off" ] ; t
echo "Using JRE_HOME: $JRE_HOME"
fi
-exec "$_RUNJAVA" $JAVA_OPTS $GERONIMO_OPTS \
+"$_RUNJAVA" $JAVA_OPTS $GERONIMO_OPTS \
-Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=false \
-Dorg.apache.geronimo.home.dir="$GERONIMO_HOME" \
-Dkaraf.home="$GERONIMO_HOME" \
@@ -205,3 +205,11 @@ exec "$_RUNJAVA" $JAVA_OPTS $GERONIMO_OP
-Djava.io.tmpdir="$GERONIMO_TMPDIR" \
-classpath "$CLASSPATH" \
org.apache.geronimo.cli.deployer.DeployerCLI "$@"
+
+# Remember the exit status
+status=$?
+
+# Reset tty
+stty echo > /dev/null 2>&1
+
+exit $status
Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo?rev=937074&r1=937073&r2=937074&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo Thu Apr 22 21:38:51 2010
@@ -409,6 +409,9 @@ elif [ "$1" = "stop" ] ; then
-classpath "$CLASSPATH" \
org.apache.geronimo.cli.shutdown.ShutdownCLI "$@"
+ # Reset tty
+ stty echo > /dev/null 2>&1
+
if [ $FORCE -eq 1 ]; then
if [ ! -z "$GERONIMO_PID" ]; then
echo "Killing: `cat $GERONIMO_PID`"