From a0570ec95266efef63f2e2cbc32826b6120e4220 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Tue, 29 Jun 2010 18:59:47 +0000 Subject: [PATCH] [318372] [dstore][shells] "export" shell command invalid for certain shells --- .../universal/miners/command/CommandMinerThread.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/command/CommandMinerThread.java b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/command/CommandMinerThread.java index 7d3fb866df0..84d8becd0aa 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/command/CommandMinerThread.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/command/CommandMinerThread.java @@ -30,6 +30,7 @@ * David McKnight (IBM) [302996] [dstore] null checks and performance issue with shell output * David McKnight (IBM) [308246] [dstore] fix for Bug 287305 breaks on z/OS due to "su" usage * David McKnight (IBM) [312415] [dstore] shell service interprets < and > sequences - handle old client/new server case + * David McKnight (IBM) [318372] [dstore][shells] "export" shell command invalid for certain shells *******************************************************************************/ package org.eclipse.rse.internal.dstore.universal.miners.command; @@ -539,8 +540,13 @@ public class CommandMinerThread extends MinerThread // initialization if (didLogin || _isTTY) { + // unsupported prompting + boolean unsupportedPrompt = theShell.endsWith("csh") || theShell.endsWith("bsh") || //$NON-NLS-1$//$NON-NLS-2$ + theShell.endsWith("tsh") || theShell.endsWith("rksh"); //$NON-NLS-1$//$NON-NLS-2$ + + String initCmd = ""; //$NON-NLS-1$ - if (_isTTY){ + if (_isTTY && !unsupportedPrompt){ initCmd = "export PS1='$PWD>';" ; //$NON-NLS-1$ } if (didLogin && !userHome.equals(_cwdStr)){