Skip to content

Fixed mac support #51

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

Open
mvidmar wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed mac support #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ define(function (require, exports, module) {
Preferences.definePreference("shell", "string", "cmd.exe");
if (brackets.platform === "win") {
Preferences.set("shell", "cmd.exe");
} else if (brackets.platform === "mac") {
Preferences.set("shell", "/bin/bash");
} else {
Preferences.set("shell", "/bin/sh");
}
Expand Down
14 changes: 12 additions & 2 deletions node/hdyShellDomain.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
if false, return free memory only.
* @return {number} The amount of memory.
*/
function _execute(cmd, cwd, isWin, shell) {
function _execute(cmd, cwd, platform, shell) {

var spawn = require("child_process").spawn,
args,
Expand All @@ -36,6 +36,9 @@
catch (e) {}

}

var isWin = (platform === "win");
var isMac = (platform === "mac");

// clearing the console with clear or clr?
if ((cmd.toLowerCase() === "clear" && !isWin) ||
Expand All @@ -49,7 +52,14 @@
cmd = shell;
}
else {
args = ["-c", cmd];
if (!isMac) {
args = ["-c", cmd];
}
else {
var macEnvironment = "for i in $(defaults read $HOME/.MacOSX/environment | sed -nE 's/^(.+)= (.+\");/\\1/p' | sed -nE 's/^[ \\t]*//p'); do eval export $i=$(defaults read $HOME/.MacOSX/environment $i); done"
args = ["-c", macEnvironment + ";" + cmd];
}

cmd = shell;
}

Expand Down
2 changes: 1 addition & 1 deletion shellPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ define(function (require, exports, module) {
ShellDomain.exec("execute",
currentCommand.text(),
cwd,
brackets.platform === "win",
brackets.platform,
_preferences.get("shell"));

CommandRoll.push(currentCommand.text());
Expand Down