different fish exec workaround
Signed-off-by: Harald Hoyer <harald@hoyer.xyz>
This commit is contained in:
parent
1ebef44098
commit
97696ec554
|
@ -73,8 +73,13 @@ in
|
||||||
}".source =
|
}".source =
|
||||||
cfg.icon;
|
cfg.icon;
|
||||||
};
|
};
|
||||||
|
|
||||||
extraOptions.programs.bash.initExtra = ''
|
extraOptions.programs.bash.initExtra = ''
|
||||||
[[ $WANT_BASH ]] || exec ${pkgs.fish}/bin/fish -l
|
if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
|
||||||
|
then
|
||||||
|
shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
|
||||||
|
exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
|
||||||
|
fi
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue