Skip to content

Fix remote process listing #1208 #1209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 9, 2017
Merged

Fix remote process listing #1208 #1209

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb58de1
Fix remote process listing #1208
gregg-miskelly Feb 8, 2017
7935887
Fix Windows client case
gregg-miskelly Feb 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/features/processPicker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,13 @@ export class RemoteAttachPicker {
}

public static getRemoteOSAndProcesses(pipeCmd: string): Promise<AttachItem[]> {

// If the client OS is NOT Windows, we need to escape '$(uname)' as otherwise it will be evaluated on the client side
// If the client OS is Windows, we don't want to do that as it will be sent as-is, and thus the if statement will be broken
const remoteUnameCommand = os.platform() !== "win32" ? "$\\(uname\\)" : "$(uname)";

// Commands to get OS and processes
const command = `bash -c 'uname && if [ $(uname) == "Linux" ] ; then ${RemoteAttachPicker.linuxPsCommand} ; elif [ $(uname) == "Darwin" ] ; ` +
const command = `bash -c 'uname && if [ "${remoteUnameCommand}" == "Linux" ] ; then ${RemoteAttachPicker.linuxPsCommand} ; elif [ "${remoteUnameCommand}" == "Darwin" ] ; ` +
`then ${RemoteAttachPicker.osxPsCommand}; fi'`;

return execChildProcessAndOutputErrorToChannel(`${pipeCmd} "${command}"`, null, RemoteAttachPicker._channel).then(output => {
Expand Down