From 36fb7217a50212d71c7b444a384126e457b999a8 Mon Sep 17 00:00:00 2001 From: "Watson, Gregory" Date: Wed, 18 Jan 2017 14:25:07 -0500 Subject: [PATCH] Use globbing to determine launcher version. Disable debugging by default. Change-Id: I0518305f266e4500c4067505b862b41bde1d115b Signed-off-by: Watson, Gregory --- bundles/org.eclipse.remote.proxy.core/bootstrap.sh | 4 ++-- .../remote/proxy/protocol/core/StreamChannelManager.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bundles/org.eclipse.remote.proxy.core/bootstrap.sh b/bundles/org.eclipse.remote.proxy.core/bootstrap.sh index 2de5ab9db94..69eaabcc653 100644 --- a/bundles/org.eclipse.remote.proxy.core/bootstrap.sh +++ b/bundles/org.eclipse.remote.proxy.core/bootstrap.sh @@ -68,7 +68,7 @@ do_download() { dd of=$proxytmp ibs=680 count=$1 IFS= read -r last echo "$last" >> $proxytmp - base64 --decode < $proxytmp | tar zxf - > /dev/null 2>&1 + base64 --decode < $proxytmp | (cd $installdir && tar zxvf -) > /dev/null 2>&1 if test $? -eq 0; then echo ok else @@ -83,7 +83,7 @@ do_download() { start_server() { #debugoptions="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=1044,quiet=y" - java -cp $plugins/org.eclipse.equinox.launcher_1.3.200.v20160318-1642.jar \ + java -cp $plugins/org.eclipse.equinox.launcher_1.*.jar \ # use globbing to find launcher version $debugoptions \ org.eclipse.equinox.launcher.Main \ -application org.eclipse.remote.proxy.server.core.application \ diff --git a/bundles/org.eclipse.remote.proxy.protocol.core/src/org/eclipse/remote/proxy/protocol/core/StreamChannelManager.java b/bundles/org.eclipse.remote.proxy.protocol.core/src/org/eclipse/remote/proxy/protocol/core/StreamChannelManager.java index eabd3d44f89..4b31d566e45 100644 --- a/bundles/org.eclipse.remote.proxy.protocol.core/src/org/eclipse/remote/proxy/protocol/core/StreamChannelManager.java +++ b/bundles/org.eclipse.remote.proxy.protocol.core/src/org/eclipse/remote/proxy/protocol/core/StreamChannelManager.java @@ -353,7 +353,7 @@ public class StreamChannelManager implements Runnable { private Sender sender; private Receiver receiver; - private boolean debug = true; + private boolean debug = false; public StreamChannelManager(InputStream in, OutputStream out) { sender = new Sender(new BufferedOutputStream(out));