mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-06 15:55:47 +02:00
Code Issues Wiki Activity

Fix check for existing proxy.

Browse source 
Change-Id: I3e6357f6f9671a2c411b873169d73041442285c3
Signed-off-by: Watson, Gregory <g.watson@computer.org>
This commit is contained in:
Watson, Gregory 2017-01-18 21:49:50 -05:00
parent fa3fe15cab
commit ac2830953d
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bundles/org.eclipse.remote.proxy.core/bootstrap.sh
View file

@ -52,11 +52,11 @@ do_check() {
echo fail:system not supported; echo fail:system not supported;
return;; return;;
esac esac
proxy=no proxy=not_found
if test -d $proxydir; then if test -d $proxydir; then
bundle="org.eclipse.remote.proxy.server.core_$1.jar" bundle="org.eclipse.remote.proxy.server.core_$1.jar"
if test -f $plugins/$bundle; then if test -f $plugins/$bundle; then
proxy=yes proxy=found
else else
mv $proxydir $proxydir.pre_$1 mv $proxydir $proxydir.pre_$1
fi fi

2
bundles/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/ProxyConnectionBootstrap.java
View file

@ -141,7 +141,7 @@ public class ProxyConnectionBootstrap {
String[] status = parts[1].split("/"); //$NON-NLS-1$ String[] status = parts[1].split("/"); //$NON-NLS-1$
context.setOSName(status[1]); context.setOSName(status[1]);
context.setOSArch(status[2]); context.setOSArch(status[2]);
context.setState(status[0].equals("proxy") ? States.START : States.DOWNLOAD); //$NON-NLS-1$ context.setState(status[0].equals("found") ? States.START : States.DOWNLOAD); //$NON-NLS-1$
return true; return true;
case "fail": //$NON-NLS-1$ case "fail": //$NON-NLS-1$
context.setErrorMessage(parts[1]); context.setErrorMessage(parts[1]);