Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

xsession: remove bashisms in start scripts

Browse source 
Fixes #836
This commit is contained in:
Robert Helgesson 2019-09-11 20:11:16 +02:00
parent aa5ba177cc
commit 0dfa1eef25
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/xsession.nix
View file

@ -130,7 +130,7 @@ in
home.file.".xprofile".text = '' home.file.".xprofile".text = ''
. "${config.home.profileDirectory}/etc/profile.d/hm-session-vars.sh" . "${config.home.profileDirectory}/etc/profile.d/hm-session-vars.sh"
if [[ -e "$HOME/.profile" ]]; then if [ -e "$HOME/.profile" ]; then
. "$HOME/.profile" . "$HOME/.profile"
fi fi
@ -152,7 +152,7 @@ in
home.file.${cfg.scriptPath} = { home.file.${cfg.scriptPath} = {
executable = true; executable = true;
text = '' text = ''
if [[ ! -v HM_XPROFILE_SOURCED ]]; then if [ -z "$HM_XPROFILE_SOURCED" ]; then
. ~/.xprofile . ~/.xprofile
fi fi
unset HM_XPROFILE_SOURCED unset HM_XPROFILE_SOURCED
@ -167,7 +167,7 @@ in
systemctl --user stop graphical-session-pre.target systemctl --user stop graphical-session-pre.target
# Wait until the units actually stop. # Wait until the units actually stop.
while [[ -n "$(systemctl --user --no-legend --state=deactivating list-units)" ]]; do while [ -n "$(systemctl --user --no-legend --state=deactivating list-units)" ]; do
sleep 0.5 sleep 0.5
done done
''; '';

2
tests/modules/misc/xsession/basic-xprofile-expected.txt
View file

@ -1,6 +1,6 @@
. "/test-home/.nix-profile/etc/profile.d/hm-session-vars.sh" . "/test-home/.nix-profile/etc/profile.d/hm-session-vars.sh"
if [[ -e "$HOME/.profile" ]]; then if [ -e "$HOME/.profile" ]; then
. "$HOME/.profile" . "$HOME/.profile"
fi fi

4
tests/modules/misc/xsession/basic-xsession-expected.txt
View file

@ -1,4 +1,4 @@
if [[ ! -v HM_XPROFILE_SOURCED ]]; then if [ -z "$HM_XPROFILE_SOURCED" ]; then
. ~/.xprofile . ~/.xprofile
fi fi
unset HM_XPROFILE_SOURCED unset HM_XPROFILE_SOURCED
@ -13,6 +13,6 @@ systemctl --user stop graphical-session.target
systemctl --user stop graphical-session-pre.target systemctl --user stop graphical-session-pre.target
# Wait until the units actually stop. # Wait until the units actually stop.
while [[ -n "$(systemctl --user --no-legend --state=deactivating list-units)" ]]; do while [ -n "$(systemctl --user --no-legend --state=deactivating list-units)" ]; do
sleep 0.5 sleep 0.5
done done