Skip to content

Linesplit and ohmyzshfix #1132

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 8 commits into from
Jan 18, 2017
Merged

Linesplit and ohmyzshfix #1132

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b891493
Renaming LaunchConfigurations
WardenGnaw Nov 30, 2016
3d1a234
Merge remote-tracking branch 'upstream/master'
WardenGnaw Jan 14, 2017
7cd1f68
Simplifying retrieving pipeTransport for attach
WardenGnaw Jan 14, 2017
1cd33d4
Removing dead code
WardenGnaw Jan 14, 2017
6fa93d4
Fixes for OhMyZsh and Line Splitting
WardenGnaw Jan 18, 2017
5297c4b
Fixing command to work for sh and adding error msg
WardenGnaw Jan 18, 2017
b2c9b53
Merge remote-tracking branch 'upstream/master' into linesplitAndOhmyz…
WardenGnaw Jan 18, 2017
723b716
Simplifying command
WardenGnaw Jan 18, 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
8 changes: 4 additions & 4 deletions src/features/processPicker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export class RemoteAttachPicker {
placeHolder: "Select the process to attach to"
};
return vscode.window.showQuickPick(processes, attachPickOptions).then(item => {
return item ? item.id : null;
return item ? item.id : Promise.reject<string>(new Error("Could not find a process id to attach."));
});
});
}
Expand Down Expand Up @@ -119,13 +119,13 @@ export class RemoteAttachPicker {

public static getRemoteOSAndProcesses(pipeCmd: string): Promise<AttachItem[]> {
// Commands to get OS and processes
const command = `uname && if [ $(uname) == "Linux" ] ; then ${RemoteAttachPicker.linuxPsCommand} ; elif [ $(uname) == "Darwin" ] ; ` +
`then ${RemoteAttachPicker.osxPsCommand}; fi`;
const command = `bash -c 'uname && if [ $(uname) == "Linux" ] ; then ${RemoteAttachPicker.linuxPsCommand} ; elif [ $(uname) == "Darwin" ] ; ` +
`then ${RemoteAttachPicker.osxPsCommand}; fi'`;

return execChildProcessAndOutputErrorToChannel(`${pipeCmd} "${command}"`, null, RemoteAttachPicker._channel).then(output => {
// OS will be on first line
// Processess will follow if listed
let lines = output.split(os.EOL);
let lines = output.split(/\r?\n/);

if (lines.length == 0) {
return Promise.reject<AttachItem[]>(new Error("Pipe transport failed to get OS and processes."));
Expand Down