diff options
| author | Simon Rettberg | 2014-07-04 15:24:07 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2014-07-04 15:24:07 +0200 |
| commit | 1322cb47113559df789a1b1bc7e152044b8500fa (patch) | |
| tree | f7ddbdb0affec11e2bbbb15a2ad25ce49740f4db | |
| parent | Bump dnbd3 commit for kernel 3.14 support (diff) | |
| parent | Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts (diff) | |
| download | tm-scripts-1322cb47113559df789a1b1bc7e152044b8500fa.tar.gz tm-scripts-1322cb47113559df789a1b1bc7e152044b8500fa.tar.xz tm-scripts-1322cb47113559df789a1b1bc7e152044b8500fa.zip | |
Merge branch 'master' of dnbd3:openslx-ng/tm-scripts
| -rw-r--r--[-rwxr-xr-x] | server/modules/xdg-users-dir-fix/etc/profile.d/99-user-dirs.sh | 16 | ||||
| -rw-r--r-- | server/modules/xdg-users-dir-fix/etc/xdg/user-dirs.conf | 11 |
2 files changed, 19 insertions, 8 deletions
diff --git a/server/modules/xdg-users-dir-fix/etc/profile.d/99-user-dirs.sh b/server/modules/xdg-users-dir-fix/etc/profile.d/99-user-dirs.sh index 5d455970..6ddee803 100755..100644 --- a/server/modules/xdg-users-dir-fix/etc/profile.d/99-user-dirs.sh +++ b/server/modules/xdg-users-dir-fix/etc/profile.d/99-user-dirs.sh @@ -1,10 +1,10 @@ #!/bin/ash -xdg-user-dirs-update --set DOWNLOAD "${HOME}/PERSISTENT/Downloads" -xdg-user-dirs-update --set DESKTOP "${HOME}/PERSISTENT/Desktop" -xdg-user-dirs-update --set TEMPLATES "${HOME}/PERSISTENT/Templates" -xdg-user-dirs-update --set PUBLICSHARE "${HOME}/PERSISTENT/PublicShare" -xdg-user-dirs-update --set DOCUMENTS "${HOME}/PERSISTENT/Documents" -xdg-user-dirs-update --set MUSIC "${HOME}/PERSISTENT/Music" -xdg-user-dirs-update --set PICTURES "${HOME}/PERSISTENT/Pictures" -xdg-user-dirs-update --set VIDEOS "${HOME}/PERSISTENT/Videos" +export XDG_DESKTOP_DIR="$HOME/PERSISTENT/Desktop" +export XDG_DOWNLOAD_DIR="$HOME/PERSISTENT/Downloads" +export XDG_TEMPLATES_DIR="$HOME/PERSISTENT/Templates" +export XDG_PUBLICSHARE_DIR="$HOME/PERSISTENT/Public" +export XDG_DOCUMENTS_DIR="$HOME/PERSISTENT/Documents" +export XDG_MUSIC_DIR="$HOME/PERSISTENT/Music" +export XDG_PICTURES_DIR="$HOME/PERSISTENT/Pictures" +export XDG_VIDEOS_DIR="$HOME/PERSISTENT/Videos" diff --git a/server/modules/xdg-users-dir-fix/etc/xdg/user-dirs.conf b/server/modules/xdg-users-dir-fix/etc/xdg/user-dirs.conf new file mode 100644 index 00000000..c8deb696 --- /dev/null +++ b/server/modules/xdg-users-dir-fix/etc/xdg/user-dirs.conf @@ -0,0 +1,11 @@ +# This controls the behaviour of xdg-user-dirs-update which is run on user login +# You can also have per-user config in ~/.config/user-dirs.conf, or specify +# the XDG_CONFIG_HOME and/or XDG_CONFIG_DIRS to override this +# + +enabled=False + +# This sets the filename encoding to use. You can specify an explicit +# encoding, or "locale" which means the encoding of the users locale +# will be used +filename_encoding=UTF-8 |