X-Git-Url: https://git.sev.monster/~sev/dotfiles.git/blobdiff_plain/ef32cb1c2ed740bba5cdbc1f9105233e99b3c106..e226ac038cb5616a177678c19023b639c3e9ef1c:/etc/zsh/.zshenv?ds=sidebyside diff --git a/etc/zsh/.zshenv b/etc/zsh/.zshenv index 1248dbf..2cbb88a 100644 --- a/etc/zsh/.zshenv +++ b/etc/zsh/.zshenv @@ -154,10 +154,10 @@ if [[ ! -v _sev_setup_path || -o login ]] { # the toplevel shell has already logged out and the dirs removed, but the # chances of that are slim. if [[ ! -v _sev_tmp ]] { + _sev_tmp=~/.local/tmp # create personal TMPDIR under system tmp t=${TMPDIR:-${TEMPDIR:-${TEMP:-${TMP:-${${TMPPREFIX%/zsh}:-/tmp}}}}}/.home-$LOGNAME [[ -e $t ]] || mkdir -m700 $t 2>/dev/null - _sev_tmp=~/.local/tmp if [[ ! -d $t ]] { # fallback TMPDIR to bare local directory or existing softlink [[ -o interactive ]] && @@ -169,33 +169,34 @@ if [[ ! -v _sev_tmp ]] { [[ -o interactive ]] && print -P "%F{red}!!! Can't create tmp dir, using $_sev_tmp%f" } - } elif [[ -f $_sev_tmp || ( -d $_sev_tmp && ! -h $_sev_tmp ) ]] { - # file or non-softlink directory is on our local dir + } elif [[ -e $_sev_tmp && ! -h $_sev_tmp ]] { + # non-softlink node is on our local dir [[ -o interactive ]] && print -P "%F{orange}*** $_sev_tmp exists, can't link to tmp dir $t, ignoring it%f" _sev_tmp=$t } else { - # link local dir to tmp dir - if [[ -h $_sev_tmp && $_sev_tmp:P != $t:P ]] { - [[ -o interactive ]] && + if [[ -h $_sev_tmp ]] { + [[ -o interactive && $_sev_tmp:P != $t:P ]] && print -P "%F{orange}*** $_sev_tmp links to ${_sev_tmp:P} and not ${t:P}, unlinking it%f" - # XXX: race condition for existing sessions still using this dir + # NOTE: ln -f doesn't seem to work reliably with softlink + # directories, so explicitly remove the target if it exists + # XXX: potential race condition + # TODO: handle cleanup of old dir if it doesn't match? unlink $_sev_tmp 2>/dev/null } + # link local dir to tmp dir ln -s $t $_sev_tmp 2>/dev/null } - if [[ -v _sev_tmp ]] { - # ensure dir is clean - _sev_zcleanup tmp - # finally create our subdir for this session - t=$_sev_tmp/.session.$$ - if ! mkdir -m700 $t 2>/dev/null; then - [[ -o interactive ]] && - print -P "%F{red}!!! Can't create session tmp subdir $t, using $_sev_tmp%f" - t=$_sev_tmp - fi - export _sev_tmp TMPDIR=$t TEMPDIR=$t TEMP=$t TMP=$t TMPPREFIX=$t/zsh - } + # ensure dir is clean + _sev_zcleanup tmp + # finally create our subdir for this session + t=$_sev_tmp/.session.$$ + if ! mkdir -m700 $t 2>/dev/null; then + [[ -o interactive ]] && + print -P "%F{red}!!! Can't create session tmp subdir $t, using $_sev_tmp%f" + t=$_sev_tmp + fi + export _sev_tmp TMPDIR=$t TEMPDIR=$t TEMP=$t TMP=$t TMPPREFIX=$t/zsh unset t } @@ -215,52 +216,43 @@ if [[ ! -v _sev_setup_xdg ]] { emulate sh -c "source $XDG_CONFIG_HOME/user-dirs.dirs" typeset -UT XDG_DATA_DIRS xdg_data_dirs - if [[ -v XDG_DATA_HOME ]] { - export XDG_DATA_HOME - } elif [[ ! -e ~/.local/share ]] { - mkdir -m760 ~/.local/share - } - xdg_data_dirs=($XDG_DATA_HOME /{opt,usr/local,usr/pkg,usr}/share - ${XDG_DATA_DIRS:+${xdg_data_dirs%%/}}) + [[ -v XDG_DATA_HOME ]] && export XDG_DATA_HOME + [[ -e ${XDG_DATA_HOME:-~/.local/share} ]] || + mkdir -m760 ${XDG_DATA_HOME:-~/.local/share} + xdg_data_dirs=($XDG_DATA_HOME ${XDG_DATA_DIRS:+${xdg_data_dirs%%/}} + /{usr{,/local,/pkg},opt{,/*{/*,}}}/share(N)) + xdg_data_dirs=($xdg_data_dirs(/N)) export XDG_DATA_DIRS typeset -UT XDG_CONFIG_DIRS xdg_config_dirs - if [[ -v XDG_CONFIG_HOME ]] { - export XDG_CONFIG_HOME - } elif [[ ! -e ~/.config ]] { - mkdir -m760 ~/.config - } + [[ -v XDG_CONFIG_HOME ]] && export XDG_CONFIG_HOME + [[ -e ${XDG_CONFIG_HOME:-~/.config} ]] || + mkdir -m760 ${XDG_CONFIG_HOME:-~/.config} # I am of the belief .local should follow FHS /usr/local... - [[ -e ~/.local/etc ]] || ln -s ~/.config ~/.local/etc - xdg_config_dirs=($XDG_CONFIG_HOME - ${XDG_CONFIG_DIRS:+${xdg_config_dirs%%/}} - {/opt,/usr/local,/usr/pkg,}/etc/xdg) + [[ -e ~/.local/etc ]] || ln -s ${XDG_CONFIG_HOME:-~/.config} ~/.local/etc + xdg_config_dirs=($XDG_CONFIG_HOME ${XDG_CONFIG_DIRS:+${xdg_config_dirs%%/}} + {,/usr{,/local,/pkg},opt{,/*{/*,}}}/etc/xdg(N)) + xdg_config_dirs=($xdg_config_dirs(/N)) export XDG_CONFIG_DIRS - if [[ -v XDG_STATE_HOME ]] { - export XDG_STATE_HOME - } elif [[ ! -e ~/.local/state ]] { - mkdir -m760 ~/.local/state - } + [[ -v XDG_STATE_HOME ]] && export XDG_STATE_HOME + [[ -e ${XDG_STATE_HOME:-~/.local/state} ]] || + mkdir -m760 ${XDG_STATE_HOME:-~/.local/state} if [[ -v XDG_CACHE_HOME ]] { export XDG_CACHE_HOME } else { - if [[ -v _sev_tmp ]] { - export XDG_CACHE_HOME=$_sev_tmp/.xdg.cache - [[ -e $XDG_CACHE_HOME ]] || mkdir -m700 $XDG_CACHE_HOME - } elif [[ ! -e ~/.cache ]] { - mkdir -m700 ~/.cache - } + export XDG_CACHE_HOME=$_sev_tmp/.xdg.cache } + [[ -e ${XDG_CACHE_HOME:-~/.cache} ]] || + mkdir -m700 ${XDG_CACHE_HOME:-~/.cache} + # NOTE: this can be set by systemd or other pre-shell supervisor, and if + # any services were started such as pipewire, we need to use the + # existing runtime dir to preserve runtime state if [[ -v XDG_RUNTIME_DIR ]] { - # NOTE: this can be set by systemd or other pre-shell supervisor, and - # if any services were started such as pipewire, we need to use - # the existing runtime dir so that we can get any existing - # program sockets or other data export XDG_RUNTIME_DIR - } elif [[ -v TMPDIR ]] { + } else { # make runtime dir in our session-specific tmpdir export XDG_RUNTIME_DIR=$TMPDIR/.xdg.runtime # same as in tmpdir creation, ensure dir doesn't exist @@ -269,8 +261,9 @@ if [[ ! -v _sev_setup_xdg ]] { } elif [[ -e $XDG_RUNTIME_DIR ]] { rm -rf $XDG_RUNTIME_DIR 2>/dev/null } - mkdir -m700 $XDG_RUNTIME_DIR 2>/dev/null } + [[ ! -e $XDG_RUNTIME_DIR ]] && + mkdir -m700 $XDG_RUNTIME_DIR 2>/dev/null export _sev_setup_xdg= }