# shift valid system paths to the front if there are any left
((len > 0 && len < $#path)) && path=("${(@)path[len + 1, -1]}" "${(@)path[1, len]}")
# include our zsh dir in fpath. unlike above, we always prefer our paths
- fpath=({${ZDOTDIR:-~/.zsh},{${_sev_home:-~},~}/.zsh}/functions/**/*(/N) "$fpath[@]")
+ fpath=({${ZDOTDIR:-{${_sev_home:-~},~}/.zsh},{${_sev_home:-~},~}/.zsh}/functions/**/*(/N) "$fpath[@]")
# remove bad paths
for (( i = 1; i <= $#fpath; i++ )) {
if [[ ! -d $fpath[$i] ]] {
# NOTE: do not set _sev_setup_path, it is set in zprofile
}
-### home dir setup & exports
+### home dir setup & additional exports
# XXX: traditionally, zshenv should just contain exports, and not touch the
-# filesystem. however, some system profile scripts that are sourced in the
-# system zprofile may attempt to do things that rely on some of these
-# vars. for example, `flatpak-bindir.sh` in the Arch Linux flatpak package
-# references $XDG_DATA_HOME with no fallback. since we do special handling
-# for these vars before we export them, we're forced to do it all here
-# instead of zprofile.
+# filesystem. however, our TMPDIR and XDG vars rely on mutable user paths
+# that may not exist, and as such need to be set up before the rest of the
+# system can use them. this is important as some environments include code
+# in the global zprofile, or source scripts of other shells in the global
+# zprofile, that may rely on our desired dir structure and vars pointing
+# to it. for example, `flatpak-bindir.sh` in the Arch Linux flatpak
+# package references $XDG_DATA_HOME with no fallback. since we do special
+# handling for these vars before we export them, we're forced to do it all
+# here instead of at the top of the zprofile.
## xdg local dir
# NOTE: need this for tmp, so confirm it exists.
-# XXX: perms are not specified for XDG dirs except runtime, but I think 760
-# makes the most sense. shouldn't break anything since no one else should
-# be poking around in our dir.
-[[ -e ~/.local ]] || mkdir -m760 ~/.local
+# XXX: perms are not specified for XDG dirs except runtime. 760 makes the most
+# sense, but we need to be a bit more permissive for zsu.
+[[ -e ~/.local ]] && chmod 755 ~/.local || mkdir -pm766 ~/.local
## tmp
# NOTE: specs say that POSIX tmp and XDG runtime directories should exist
# though it is not expressly spec compliant. this may also cause problems
# with disowned applications that still try to use the directories after
# the toplevel shell has already logged out and the dirs removed, but the
-# chances of that are slim.
+# chances of that are slim. this also needs to be adjusted for usermode
+# Xorg, as it requires $PREFIX/tmp/.X11-unix on most installs.
if [[ ! -v _sev_tmp ]] {
_sev_tmp=~/.local/tmp
# create personal TMPDIR under system tmp
- # NOTE: under proot with uid remapping, we can reuse old tmp, without
- # worrying about permission issues; intended for proot under termux.
- # XXX: _sev_proot_old_user only works if /tmp is shared!
- t=${TMPDIR:-${TEMPDIR:-${TEMP:-${TMP:-${${TMPPREFIX%/zsh}:-/tmp}}}}}/.home-${_sev_proot_old_username:-$LOGNAME}
+ # NOTE: under proot with uid remapping and shared /tmp, we can reuse old
+ # dir, without worrying about permission issues; intended for termux.
+ t=${TMPDIR:-${TEMPDIR:-${TEMP:-${TMP:-${${TMPPREFIX%/zsh}:-/tmp}}}}}/.home-${_sev_proot_real_user:-$LOGNAME}
[[ -e $t ]] || mkdir -m700 $t 2>/dev/null
if [[ ! -d $t ]] {
# fallback TMPDIR to bare local directory or existing softlink
[[ -h $_sev_tmp && ! -d _sev_tmp ]] && unlink $_sev_tmp 2>/dev/null
[[ ! -e $_sev_tmp ]] && mkdir -m700 $_sev_tmp 2>/dev/null
if [[ ! -d $_sev_tmp ]] {
- _sev_tmp=${$(mktemp 2>/dev/null):/tmp}
+ _sev_tmp=${$(mktemp 2>/dev/null):-/tmp}
[[ -o interactive ]] &&
print -P "%F{red}!!! Can't create tmp dir, using $_sev_tmp%f"
}
print -P "%F{orange}*** $_sev_tmp exists, can't link to tmp dir $t, ignoring it%f"
_sev_tmp=$t
} else {
- if [[ -h $_sev_tmp ]] {
- [[ -o interactive && $_sev_tmp:P != $t:P ]] &&
+ if [[ ! -v $_sev_tmp_keep_link && -h $_sev_tmp && $_sev_tmp:P != $t:P ]] {
+ [[ -o interactive ]] &&
print -P "%F{orange}*** $_sev_tmp links to ${_sev_tmp:P} and not ${t:P}, unlinking it%f"
# NOTE: ln -f doesn't seem to work reliably with softlink
# directories, so explicitly remove the target if it exists
# 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 [[ ! -e $_sev_tmp ]] {
+ # link local dir to tmp dir
+ ln -s $t $_sev_tmp 2>/dev/null
+ }
}
# ensure dir is clean
_sev_zcleanup tmp
## perl local lib
[[ ! -v PERL_LOCAL_LIB_ROOT && -v commands[perl] &&
- -d $XDG_DATA_HOME/perl5/lib/perl5 ]] &&
- eval $(perl -I$XDG_DATA_HOME/perl5/lib/perl5 \
- -Mlocal::lib=$XDG_DATA_HOME/perl5 2>/dev/null)
+ -d ${XDG_DATA_HOME:-~/.local/share}/perl5/lib/perl5 ]] &&
+ eval $(perl -I${XDG_DATA_HOME:-~/.local/share}/perl5/lib/perl5 \
+ -Mlocal::lib=${XDG_DATA_HOME:-~/.local/share}/perl5 2>/dev/null)
## go
if [[ -v commands[go] ]] {
projects / sev's projects / dotfiles.git / blobdiff