foo.sh/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

autofs: Fix cache path when xdg runtime is not set

Browse source
This commit is contained in:
Timo Makinen 2020-11-14 17:13:56 +00:00
parent 822e46c818
commit f89672dd59
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
roles/autofs/files/usercache.csh
View file

@ -1,4 +1,11 @@
if ($uid > 999 && "`/usr/bin/id -gn`" == "`/usr/bin/id -un`") then if ($uid > 999 && "`/usr/bin/id -gn`" == "`/usr/bin/id -un`") then
if ( ! ($?XDG_RUNTIME_DIR) ) then
if ( -d "/run/user/${uid}" ) then
setenv XDG_RUNTIME_DIR "/run/user/${uid}"
else
setenv XDG_RUNTIME_DIR "${HOME}"
endif
endif
setenv XDG_CACHE_HOME "${XDG_RUNTIME_DIR}/.cache" setenv XDG_CACHE_HOME "${XDG_RUNTIME_DIR}/.cache"
if ( ! -d "${XDG_CACHE_HOME}" ) then if ( ! -d "${XDG_CACHE_HOME}" ) then
install -d -m 0700 "${XDG_CACHE_HOME}" install -d -m 0700 "${XDG_CACHE_HOME}"

8
roles/autofs/files/usercache.sh
View file

@ -1,4 +1,12 @@
if [ $UID -gt 999 ] && [ "`/usr/bin/id -gn`" = "`/usr/bin/id -un`" ]; then if [ $UID -gt 999 ] && [ "`/usr/bin/id -gn`" = "`/usr/bin/id -un`" ]; then
if [ -z "$XDG_RUNTIME_DIR" ]; then
if [ -d "/run/user/${UID}" ]; then
XDG_RUNTIME_DIR="/run/user/${UID}"
else
XDG_RUNTIME_DIR="$HOME"
fi
export XDG_RUNTIME_DIR
fi
export XDG_CACHE_HOME="$XDG_RUNTIME_DIR/.cache" export XDG_CACHE_HOME="$XDG_RUNTIME_DIR/.cache"
if [ ! -d "$XDG_CACHE_HOME" ] ; then if [ ! -d "$XDG_CACHE_HOME" ] ; then
install -d -m 0700 "$XDG_CACHE_HOME" install -d -m 0700 "$XDG_CACHE_HOME"