diff options
| author | Nick Schermer <nick@xfce.org> | 2012-02-24 22:04:37 +0100 |
|---|---|---|
| committer | Nick Schermer <nick@xfce.org> | 2012-03-24 22:24:36 +0100 |
| commit | 279eba95c745a946e431458777212b28647328b2 (patch) | |
| tree | 442877b049e9aa421f898f642266720085a577c5 /scripts | |
| parent | ccd9d7a93a85159c571518b12e326d1c7064f9c7 (diff) | |
| download | xfce4-session-279eba95c745a946e431458777212b28647328b2.tar.gz | |
Drop user-dirs.dirs handling.
This is heavily outdated.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/xinitrc.in.in | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in index a85ac4a3..bfef2ca9 100755 --- a/scripts/xinitrc.in.in +++ b/scripts/xinitrc.in.in @@ -45,35 +45,6 @@ if which xdg-user-dirs-update >/dev/null 2>&1; then xdg-user-dirs-update fi -if test -f "$XDG_CONFIG_HOME/user-dirs.dirs"; then - . "$XDG_CONFIG_HOME/user-dirs.dirs" - # i'm deliberately not 'export'-ing the XDG_ vars, because you shouldn't - # rely on the env vars inside apps, since the file could be changed at - # any time by the user. this is solely here for migration purposes. - - # 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" != "$XDG_DESKTOP_DIR" - then - echo "Migrating $HOME/Desktop to $XDG_DESKTOP_DIR..." - test -d "$XDG_DESKTOP_DIR" && rmdir "$XDG_DESKTOP_DIR" - mv "$HOME/Desktop" "$XDG_DESKTOP_DIR" || echo "Desktop migration failed" >&2 - fi - - if test -d "$HOME/Templates" -a ! -L "$HOME/Templates" \ - -a "$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" - mv "$HOME/Templates" "$XDG_TEMPLATES_DIR" || echo "Templates migration failed" >&2 - fi -fi - - # Modify libglade and glade environment variables so that # it will find the files installed by Xfce LIBGLADE_MODULE_PATH="$LIBGLADE_MODULE_PATH:@XFCE_LIBGLADE_MODULE_PATH@" |