diff options
| author | Nick Schermer <nick@xfce.org> | 2011-11-17 21:37:00 +0100 |
|---|---|---|
| committer | Nick Schermer <nick@xfce.org> | 2011-11-17 21:37:00 +0100 |
| commit | f15c917ba9012ce0920c2c217489ae8d8eb3b6f1 (patch) | |
| tree | 90cbae9eaadb3d42627dc2b73ccdb1a87bbf8e57 /scripts | |
| parent | 8f77ee1d71d82fa48a58ecd00ea9c979bba3fa00 (diff) | |
| download | xfce4-session-f15c917ba9012ce0920c2c217489ae8d8eb3b6f1.tar.gz | |
Don't try to remove the $HOME directory (bug #8154).
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/xinitrc.in.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in index f5829341..e63eac1b 100755 --- a/scripts/xinitrc.in.in +++ b/scripts/xinitrc.in.in @@ -54,7 +54,8 @@ if test -f "$XDG_CONFIG_HOME/user-dirs.dirs"; then # a bit of user dir migration... if test -d "$HOME/Desktop" -a ! -L "$HOME/Desktop" \ -a "$XDG_DESKTOP_DIR" \ - -a "$HOME/Desktop" != "$XDG_DESKTOP_DIR" + -a "$HOME/Desktop" != "$XDG_DESKTOP_DIR" \ + -a "$HOME" != "$XDG_DESKTOP_DIR" then echo "Migrating $HOME/Desktop to $XDG_DESKTOP_DIR..." test -d "$XDG_DESKTOP_DIR" && rmdir "$XDG_DESKTOP_DIR" @@ -63,7 +64,8 @@ if test -f "$XDG_CONFIG_HOME/user-dirs.dirs"; then if test -d "$HOME/Templates" -a ! -L "$HOME/Templates" \ -a "$XDG_TEMPLATES_DIR" \ - -a "$HOME/Templates" != "$XDG_TEMPLATES_DIR" + -a "$HOME/Templates" != "$XDG_TEMPLATES_DIR" \ + -a "$HOME" != "$XDG_TEMPLATES_DIR" then echo "Migrating $HOME/Templates to $XDG_TEMPLATES_DIR..." test -d "$XDG_TEMPLATES_DIR" && rmdir "$XDG_TEMPLATES_DIR" |