HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Start bash as a login shell in VTE under OS X

Browse Source 
Graphical applications on OS X are started using launchd and don't inherit
shell's environment variables so we don't get the PS1 value. Do the same
as the OS X terminal emulator which runs the shell as a login shell (and yes,
on OS X .bash_profile is read for shells started in the terminal application
instead of .bashrc).
This commit is contained in:
Jiří Techet 2015-04-06 19:19:55 +02:00
parent ed3142d0df
commit 942d4c6b7f
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/keyfile.c
View File

@ -861,6 +861,13 @@ static void load_dialog_prefs(GKeyFile *config)
struct passwd *pw = getpwuid(getuid());
const gchar *shell = (pw != NULL) ? pw->pw_shell : "/bin/sh";
#ifdef __APPLE__
/* Geany is started using launchd on OS X and we don't get any environment variables
* so PS1 isn't defined. Start as a login shell to read the corresponding config files. */
if (strcmp(shell, "/bin/bash") == 0)
shell = "/bin/bash -l";
#endif
vc = g_new0(VteConfig, 1);
vte_info.dir = utils_get_setting_string(config, "VTE", "last_dir", NULL);
if ((vte_info.dir == NULL || utils_str_equal(vte_info.dir, "")) && pw != NULL)