max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-22 22:16:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4827 from matthewbauer/run-bashrc-first-in-nix-develop

Browse source 
Source bashrc first in nix develop
This commit is contained in:
Eelco Dolstra 2021-05-18 11:31:52 +02:00 committed by GitHub
commit de77d1b924
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/nix/develop.cc
View file

@ -395,7 +395,7 @@ struct CmdDevelop : Common, MixEnvironment
if (verbosity >= lvlDebug) if (verbosity >= lvlDebug)
script += "set -x\n"; script += "set -x\n";
script += fmt("rm -f '%s'\n", rcFilePath); script += fmt("command rm -f '%s'\n", rcFilePath);
if (phase) { if (phase) {
if (!command.empty()) if (!command.empty())
@ -414,7 +414,7 @@ struct CmdDevelop : Common, MixEnvironment
} }
else { else {
script += "[ -n \"$PS1\" ] && [ -e ~/.bashrc ] && source ~/.bashrc;\n"; script = "[ -n \"$PS1\" ] && [ -e ~/.bashrc ] && source ~/.bashrc;\n" + script;
if (developSettings.bashPrompt != "") if (developSettings.bashPrompt != "")
script += fmt("[ -n \"$PS1\" ] && PS1=%s;\n", shellEscape(developSettings.bashPrompt)); script += fmt("[ -n \"$PS1\" ] && PS1=%s;\n", shellEscape(developSettings.bashPrompt));
if (developSettings.bashPromptSuffix != "") if (developSettings.bashPromptSuffix != "")