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

provide basic shell prompting for linux client (defect 142953)

Browse source
This commit is contained in:
David McKnight 2006-05-23 18:55:41 +00:00
parent a167eaa99b
commit 630b582f3b
1 changed files with 55 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/shells/LocalShellThread.java
View file

@ -141,11 +141,35 @@ public class LocalShellThread extends Thread
String[] envVars = getEnvironmentVariables(false);
if (theShell == null)
{
String property = "SHELL=";
for (int i = 0; i < envVars.length; i++)
{
String var = envVars[i];
if (var.startsWith(property))
{
theShell = var.substring(property.length(), var.length());
if (theShell.endsWith("bash"))
{
theShell = "sh";
}
}
}
if (theShell == null)
{
theShell = "sh";
}
if (_isTTY)
{
if (_invocation.equals(">"))
{
_invocation = "sh";
_invocation = theShell;
_isShell = true;
}
@ -159,11 +183,12 @@ public class LocalShellThread extends Thread
{
if (_invocation.equals(">"))
{
_invocation = "sh";
_invocation = theShell;
_isShell = true;
}
String args[] = new String[1];
args[0] = _invocation;
//args[1] = "-i";
_theProcess = Runtime.getRuntime().exec(args[0], envVars, theDirectory);
}
@ -269,6 +294,30 @@ public class LocalShellThread extends Thread
}
if (_isShell && !_isWindows && !_isTTY)
{
OutputStream output = _theProcess.getOutputStream();
BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(output));
createPrompt(writer);
//createObject("prompt", _cwdStr + ">");
}
}
private void createPrompt(BufferedWriter writer)
{
try
{
writer.write("echo $PWD'>'");
writer.write('\n');
writer.flush();
}
catch (Exception e)
{
}
}
public BufferedReader getOutputStream()
@ -323,12 +372,14 @@ public class LocalShellThread extends Thread
// special case for pattern interpretting
// if cwd is not set, then files aren't resolved
// create mock prompt to ensure that they do get resolved
if (input.startsWith("cd ") || input.equals("cd"))
//if (input.startsWith("cd ") || input.equals("cd"))
{
createPrompt(writer);
/*
writer.write("echo $PWD'>'");
writer.write('\n');
writer.flush();
*/
// sleep to allow reader to interpret before going on
try
{